diff --git a/scripts/crafttweaker/early/removals/Vanilla.zs b/scripts/crafttweaker/early/removals/Vanilla.zs index 84f895a3..89ec0cce 100644 --- a/scripts/crafttweaker/early/removals/Vanilla.zs +++ b/scripts/crafttweaker/early/removals/Vanilla.zs @@ -26,6 +26,7 @@ static arrayRemovals as IItemStack[][] = [ Helper.getRemovalItems("conduit",Global.conduits), Helper.getRemovalItems("helm",Global.helmets), Helper.getRemovalItems("jaopca:block",Global.joapcaBlocks), + Helper.getRemovalItems("legs",Global.legs), //oredict--------------------------------------------------------------------------------------------------------------- .itemArray, diff --git a/scripts/crafttweaker/early/util/GlobalHelper.zs b/scripts/crafttweaker/early/util/GlobalHelper.zs index ff2a2a1b..70d55c7e 100644 --- a/scripts/crafttweaker/early/util/GlobalHelper.zs +++ b/scripts/crafttweaker/early/util/GlobalHelper.zs @@ -5,7 +5,7 @@ import crafttweaker.item.IItemStack; static enchantBlacklist as IItemStack[][string] = { "axe": [ - , + , , , , @@ -89,7 +89,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , , , @@ -192,6 +191,8 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , + , , , , @@ -222,6 +223,7 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , , , @@ -273,36 +275,17 @@ static enchantBlacklist as IItemStack[][string] = { ], "bow": [ - , - , , , , - , , , , - , - , - , - , - , , - , , , , - , - , , - , - , - , - , - , - , - , - , , , , @@ -310,15 +293,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , - , - , - , - , - , - , - , - , , , , @@ -343,11 +317,7 @@ static enchantBlacklist as IItemStack[][string] = { ], "chest": [ - , - , - , , - , , , , @@ -359,7 +329,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , , , @@ -403,23 +372,13 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , - , - , , , - , , - , , - , - , , - , - , , , - , , , , @@ -428,11 +387,9 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , , , - , , , , @@ -443,29 +400,20 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , - , - , - , - , - , - , - , - , - , - , , , , , - , , , - , , , , , + , + , + , + , , , , @@ -473,28 +421,12 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , - , , - , , - , - , , - , - , - , - , - , - , - , - , , , - , - , - , , , , @@ -505,8 +437,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , - , , , , @@ -518,7 +448,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , , , @@ -534,7 +463,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , ], "fishing": [ @@ -562,6 +490,9 @@ static enchantBlacklist as IItemStack[][string] = { ], "helm": [ + , + , + , , , , @@ -587,7 +518,6 @@ static enchantBlacklist as IItemStack[][string] = { , , , - , , , , @@ -601,6 +531,7 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , , , @@ -637,6 +568,7 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , , , @@ -644,9 +576,11 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , , , + , , , , @@ -666,6 +600,9 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , + , + , , , , @@ -764,10 +701,48 @@ static enchantBlacklist as IItemStack[][string] = { ], "legs": [ + , + , + , + , , + , , , - , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , , , , @@ -794,13 +769,28 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , + , + , + , + , + , , + , + , , , , , , , + , + , + , + , + , + , + , , , , @@ -809,34 +799,51 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , + , + , , , , , + , , , , , , , + , , , , + , , + , + , , + , , , , , + , , , , , , , + , , , + , + , + , + , + , + , , , , @@ -847,7 +854,14 @@ static enchantBlacklist as IItemStack[][string] = { , , , + , , + , + , + , + , + , + , ], "shears": [ @@ -1034,4 +1048,4 @@ function getRemovalItems(blacklistName as string, items as IItemStack[]) as IIte } } return ret; -} \ No newline at end of file +} diff --git a/scripts/crafttweaker/mid/additions/vanilla/Crafting.zs b/scripts/crafttweaker/mid/additions/vanilla/Crafting.zs index 5621e24c..f6dfc491 100644 --- a/scripts/crafttweaker/mid/additions/vanilla/Crafting.zs +++ b/scripts/crafttweaker/mid/additions/vanilla/Crafting.zs @@ -126,6 +126,19 @@ static shapedBuilders as Holder[] = [ , ]), //Grindstone + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Sky Stone Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Sky Stone Block Chest + + //aetherii------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Skyroot Chest + //aroma1997sdimension--------------------------------------------------------------------------------------------------- Util.simpleShaped(, "wide", [ , @@ -142,6 +155,40 @@ static shapedBuilders as Holder[] = [ //artisanworktables----------------------------------------------------------------------------------------------------- Util.simpleShaped(, "ring", [ , ]), //Basic Worktable + //atum------------------------------------------------------------------------------------------------------------------ + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Limestone Chest + + //blueskies------------------------------------------------------------------------------------------------------------ + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Bluebright Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Cherry Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Dusk Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Frostbright Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Lunar Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Maple Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Starlit Chest + //bonsaitrees----------------------------------------------------------------------------------------------------------- Util.dynamicShaped(, { :[0,1,3], :[2,4] }, 3, 2), //Bonsai Pot @@ -272,6 +319,12 @@ static shapedBuilders as Holder[] = [ :[4] }), //Tank + //erebus---------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8], + :[4] + }), //Petrified Wood Chest + //exchangers------------------------------------------------------------------------------------------------------------ Util.dynamicShaped(, { :[0,2,6,8], @@ -316,6 +369,30 @@ static shapedBuilders as Holder[] = [ ]), //Tier 1 Space Suit Boots + //forestry------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[1], + :[4], + :[3,5,6,7,8] + }), //Arborist's Chest + + Util.dynamicShaped(, { + :[1], + :[4], + .anyDamage():[3,5,6,7,8] + }), //Lepidopterist's Chest + + Util.dynamicShaped(, { + :[1], + :[4], + :[3,5,6,7,8] + }), //Apiarist's Chest + + //glacidus-------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Underground Chest + //hunting dimension----------------------------------------------------------------------------------------------------- Util.simpleShaped(, "plus", [, , ]) .setMarkIndex(1) @@ -333,6 +410,38 @@ static shapedBuilders as Holder[] = [ ]), //Machine Reader + //midnight-------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Shadowroot Chest + + //mist----------------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Niobium Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8], + :[4] + }), //Niobium Trapped Chest + + //moreplanets----------------------------------------------------------------------------------------------------------- + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Infected Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Cheese Spore Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Alien Chest + + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Alien Berry Chest + //moreplates------------------------------------------------------------------------------------------------------------ Util.dynamicShaped(, { :[0,2,6,8], @@ -488,6 +597,10 @@ static shapedBuilders as Holder[] = [ //thebetweenlands------------------------------------------------------------------------------------------------------- Util.dynamicShaped(, { :[0,2,3,5] }, 3, 2), //Rubber Boots + Util.dynamicShaped(, { + :[0,1,2,3,5,6,7,8] + }), //Weedwood Chest + //thermalexpansion------------------------------------------------------------------------------------------------------ Util.dynamicShaped(, { :[1], @@ -678,6 +791,9 @@ static shapelessBuilders as Holder[] = [ Util.shapeless(, [, ]), //Enchanting Table + Util.shapeless(, [, + ]), //Trapped Chest + //moreplanets----------------------------------------------------------------------------------------------------------- Util.shapeless(, []), //Black Hole Storage Schematic (Ion Cannon) diff --git a/scripts/crafttweaker/mid/additions/vanilla/Furnace.zs b/scripts/crafttweaker/mid/additions/vanilla/Furnace.zs index e9276eaa..cb5f6035 100644 --- a/scripts/crafttweaker/mid/additions/vanilla/Furnace.zs +++ b/scripts/crafttweaker/mid/additions/vanilla/Furnace.zs @@ -7,19 +7,109 @@ import scripts.crafttweaker.early.util.Stacks as Stack; //ordered by xp and then alphabetically by the output static recipeMap as double[IIngredient][IItemStack] = { :{:0.1}, //toast + :{:0.1}, //Baguette + :{:0.1}, //Rice Bread + :{:0.1}, //Agiosite + :{:0.1}, //Burrukai Ribs + :{:0.1}, //Fried Moa Egg + :{:0.1}, //Kirrid Cutlet + :{:0.1}, //Quicksoil Glass + :{:0.1}, //Roasted Skyroot Lizard on a Stick + :{:0.1}, //Roast Taegore + :{:0.1}, //Candlefish + :{:0.1}, //Charger Shank + :{:0.1}, //Chimera Chop + :{:0.1}, //Crimson Skipper + :{:0.1}, //Crimson Stripefish + :{:0.1}, //Dark Hatchetfish + :{:0.1}, //Fingerfish + :{:0.1}, //Furloin Chop + :{:0.1}, //Golden Gullfish + :{:0.1}, //Halycon Beef + :{:0.1}, //Ironback + :{:0.1}, //Limefish + :{:0.1}, //Pearl Stripefish + :{:0.1}, //Rainbowfish + :{:0.1}, //Razorfish + :{:0.1}, //Rocketfish + :{:0.1}, //Sailback + :{:0.1}, //Turquoise Stripefish + :{:0.1}, //Ursa Meat + :{:0.1}, //Violet Skipper :{:0.1}, //cooked fish fillet :{:0.1}, //cooked whale steak + :{:0.1}, //Cooked Frog Legs :{:0.1}, //iron nugget from can :{:0.1}, //cooked camel + :{:0.1}, //Crystal Glass + :{:0.1}, //Emmer Bread + :{:0.1}, //Carved Limestone Bricks + :{:0.1}, //Cracked Limestone Bricks + :{:0.1}, //Limestone + :{:0.1}, //Mud Brick + :{:0.1}, //Smoked Carabeef + :{:0.1}, //Charoite (Everbright) + :{:0.1}, //Charoite (Everdawn) + :{:0.1}, //Cracked Lunar Stone Bricks + :{:0.1}, //Cracked Turquoise Stone Bricks + :{:0.1}, //Crystal Glass + :{:0.1}, //Horizonite Ingot + :{:0.1}, //Lunar Stone + :{:0.1}, //Midnight Glass + :{:0.1}, //Turquoise Stone :{:0.1}, //venison steak + :{:0.1}, //Metamorphic Forest Stone + :{:0.1}, //Metamorphic Plains Stone + :{:0.1}, //Metamorphic Mountain Stone + :{:0.1}, //Metamorphic Fungal Stone + :{:0.1}, //Metamorphic Swamp Stone + :{:0.1}, //Metamorphic Desert Stone + :{:0.1}, //Metamorphic Taiga Stone + :{:0.1}, //Metamorphic Mesa Stone :{:0.1}, //channel + :{:0.1}, //Clay Barrel + :{:0.1}, //Clay Barrel Extension :{:0.1}, //clay bucket + :{:0.1}, //Dark Bricks :{:0.1}, //clay shears :{:0.1}, //faucet :{:0.1}, //white porcelain + :{:0.1}, //White Porcelain Barrel Extension + :{:0.1}, //White Porcelain Barrel :{:0.1}, //porcelain brick + :{:0.1}, //Cooking for Blockheads I + :{:0.1}, //Amber Glass + :{:0.1}, //Cooked Beetle Larva + :{:0.1}, //Cooked Titan Chop :{:0.1}, //cooked titan stew + :{:0.1}, //Cooked Prickly Pear + :{:0.1}, //Cooked Grasshopper Leg + :{:0.1}, //Crispy Tarantula Leg + :{:0.1}, //Bone Shard + :{:0.1}, //Honey Drip + :{:0.1}, //Mud Brick + :{:0.1}, //Gneiss Rock + :{:0.1}, //Petrified Wood + :{:0.1}, //Roasted Heart of the Stag + :{:0.1}, //Umberstone + :{:0.1}, //Kepler 22b Stone + :{:0.1}, //Volcanic Ingot + :{:0.1}, //Roasted Grain + :{:0.1}, //Fire Agate Sapling + :{:0.1}, //Burnt Sapling + :{:0.1}, //Cloudy Shard + :{:0.1}, //Cooked Luggeroth Chop + :{:0.1}, //Foggy Glass :{:0.1}, //gaia stone + :{:0.1}, //Large Calamari + :{:0.1}, //Lurmorus Steak + :{:0.1}, //Small Calamari + :{:0.1}, //Beef Patty (Cooked) + :{:0.1}, //Mars Stone + :{:0.1}, //Grilled Porcali Meat + :{:0.1}, //Raisins + :{:0.1}, //Thawed Antinatric Stone + :{:0.1}, //Dried Kelp :{:0.1}, //hunter wing :{:0.1}, //stag flank :{:0.1}, //stinger egg @@ -35,6 +125,8 @@ static recipeMap as double[IIngredient][IItemStack] = { :{:0.1}, //cooked rabbit :{:0.1}, //glass :{:0.1}, //stone + :{:0.1}, //Gray Clay + :{:0.1}, //Red Clay :{:0.1}, //cooked mossling meat :{:0.1}, //cooked forest runner meat :{:0.1}, //cooked momo meat @@ -49,15 +141,89 @@ static recipeMap as double[IIngredient][IItemStack] = { :{:0.1}, //cooked galaga meat :{:0.1}, //cooked hulter meat :{:0.1}, //cooked brachiodon meat + :{:0.1}, //Cooked Brown Mushroom + :{:0.1}, //Cooked Black Mushroom + :{:0.1}, //Cooked Pink Mushroom + :{:0.1}, //Cooked Puffball + :{:0.1}, //Cooked Sand Mushroom + :{:0.1}, //Cooked Spotted Mushroom + :{:0.1}, //Cooked Cup Mushroom + :{:0.1}, //Cooked Azure Mushroom + :{:0.1}, //Cooked Green Mushroom + :{:0.1}, //Cooked Gray Mushroom + :{:0.1}, //Cooked Copper Mushroom + :{:0.1}, //Cooked Silver Mushroom + :{:0.1}, //Cooked Beige Mushroom + :{:0.1}, //Cooked Gold Mushroom + :{:0.1}, //Cooked White Mushroom + :{:0.1}, //Cooked Violet Mushroom + :{:0.1}, //Cooked Lilac Mushroom + :{:0.1}, //Cooked Tan Mushroom + :{:0.1}, //Cooked Red Mushroom + :{:0.1}, //Cooked Coral Mushroom + :{:0.1}, //Cooked Orange Mushroom + :{:0.1}, //Cooked Yellow Mushroom + :{:0.1}, //Cooked Blue Mushroom + :{:0.1}, //Cooked Purple Mushroom + :{:0.1}, //Cooked Marsh Mushroom + :{:0.1}, //Peat + :{:0.1}, //Saltpeter + :{:0.1}, //Sapropel + :{:0.1}, //Porous Foggy Stone + :{:0.1}, //Ceramic Urn + :{:0.1}, //Cracked Soulstone Bricks :{:0.1}, //cooked imphide + :{:0.1}, //Congealed Magma Cream :{:0.1}, //cooked ghast meat :{:0.1}, //meaty stew + :{:0.1}, //Smooth Brownstone :{:0.1}, //mom's spghetti - :{:0.1}, //cooked apple - :{:0.1}, //toasted bread + *3:{:0.1}, //Green Slime Channel + *3:{:0.1}, //Blue Slime Channel + *3:{:0.1}, //Purple Slime Channel + *3:{:0.1}, //Blood Slime Channel + *3:{:0.1}, //Magma Slime Channel + *3:{:0.1}, //Pink Slime Channel + :{:0.1}, //Consecrated Soil + :{:0.1}, //Cooked Aurorian Pork + :{:0.1}, //Aurorian Stone + :{:0.1}, //Cooked Anadia Meat + :{:0.1}, //Cooked Barnacle Flesh + :{:0.1}, //Cracked Betweenstone Bricks + :{:0.1}, //Cracked Betweenstone Tiles + :{:0.1}, //Cracked Limestone Bricks + :{:0.1}, //Cracked Cragrock Bricks + :{:0.1}, //Cracked Chiseled Cragrock + :{:0.1}, //Cracked Cragrock Tiles + :{:0.1}, //Dead Lichen + :{:0.1}, //Dead Moss + :{:0.1}, //Dead Weedwood Bush + :{:0.1}, //Filtered Silt Glass + :{:0.1}, //Fried Swamp Kelp :{:0.1}, //fried frog's leg + :{:0.1}, //Mud Brick + *5:{:0.1}, //Kraken Calamari :{:0.1}, //cooked mire snail egg + :{:0.1}, //Cracked Mud Tiles + :{:0.1}, //Baked Olm Egg Cluster + :{:0.1}, //Olmlette + :{:0.1}, //Green Polished Dentrothyst + :{:0.1}, //Orange Polished Dentrothyst + :{:0.1}, //Polished Limestone + :{:0.1}, //Silt Glass + :{:0.1}, //Sludge Jello + :{:0.1}, //Smooth Betweenstone + :{:0.1}, //Smooth Cragrock + :{:0.1}, //Smooth Pitstone :{:0.1}, //seared snail flesh + :{:0.1}, //Light Gray Rockwool + :{:0.1}, //cooked apple + :{:0.1}, //Cooked Bacon + :{:0.1}, //Cooked Brown Mushroom + :{:0.1}, //Cooked Red Mushroom + :{:0.1}, //toasted bread + :{:0.1}, //Crag Rock + :{:0.1}, //Red Rock :{:0.1}, //cooked meef :{:0.1}, //cooked venison :{:0.1}, //cheese puff @@ -73,6 +239,30 @@ static recipeMap as double[IIngredient][IItemStack] = { :{:0.1}, //onion rings :{:0.1}, //roasted marshmellow :{:0.1}, //tomato sauce + :{:0.1}, //Cooked Alien Bacon + :{:0.1}, //Cooked Alien Beef + :{:0.1}, //Altum Stone + :{:0.1}, //Astros Moonstone + :{:0.1}, //Atheon Stone + :{:0.1}, //Calamari + :{:0.1}, //Caligro Stone + :{:0.1}, //Centotl Stone + :{:0.1}, //Chocolate Bar + :{:0.1}, //Cooked Blade Fish + :{:0.1}, //Cooked Blubber Fish + *4:{:0.1}, //Cooked Dough + :{:0.1}, //Cooked Gypsy Fish + :{:0.1}, //Exodus Stone + :{:0.1}, //Kriffstone + :{:0.1}, //Maveth Stone + :{:0.1}, //Oasis Stone + :{:0.1}, //Lost Cobblestone + :{:0.1}, //Popcorn + :{:0.1}, //Purgot Stone + :{:0.1}, //Toci Stone + :{:0.1}, //Vortex Stone + :{:0.1}, //Xathian Stone + :{:0.1}, //Zolstone :{:0.2}, //sky stone :{:0.2}, //tickened glass :{:0.2}, //plastic @@ -131,4 +321,4 @@ function run() { furnace.addRecipe(output,input,xp); } } -} \ No newline at end of file +}