diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fa268d9a..c1656f43d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ Nothing (I tend to only add finished Stuff to the Changelog). 6.16.02: (Not released yet) [IMPROVED] Terrafirmacraft Blocks when harvested with GT Tools will use four times less durability, in order to make my Tools on par with TFC Axes/Pickaxes/Shovels. Better Solution than just mindlessly buffing my Tools for everything. -[COMPAT] Bluepower and Project Red have better Stone Type Support, and some minor Recipe fixes. +[COMPAT] Bluepower, Project Red, Biomes O'Plenty and Applied Energiestics now have better Stone Type Support, and also some minor Recipe fixes. [FIXED] My Betweenlands Durability usage check for GT Tools did the opposite of what it was actually supposed to do, and made "Betweenlands Material GT Tools" worse instead of making "NON-Betweenlands Material GT Tools" Worse. [FIXED] Village Names should no longer crash with the Blacksmith Chest. [CHANGED] Wooden Barrels and Plastic Canisters can now have decorative nonfunctional Covers attached to them. Now you can put Hazard Stickers on them, lol. diff --git a/src/main/java/gregapi/data/RM.java b/src/main/java/gregapi/data/RM.java index 7c6a3241a..8501fcb98 100644 --- a/src/main/java/gregapi/data/RM.java +++ b/src/main/java/gregapi/data/RM.java @@ -307,11 +307,13 @@ public static boolean growmoss(ItemStack aClean, ItemStack aMossy) { public static ItemStack stoneshapes(OreDictMaterial aMat, boolean aIsCobbleTarget, ItemStack aBlock, ItemStack aStair, ItemStack aSlabs, ItemStack aWalls, ItemStack aPillar) { if (ST.valid(aBlock)) { - RM.Shredder.addRecipe1(T, 16, 16, aBlock, OP.blockDust.mat(aMat, 1)); - - if (aIsCobbleTarget) { - RM.pack(OP.rockGt.mat(aMat, 4), aBlock); - CR.shaped(aBlock, CR.DEF_NCC, "BB", "BB", 'B', OP.rockGt.dat(aMat)); + if (aMat != null) { + RM.Shredder.addRecipe1(T, 16, 16, aBlock, OP.blockDust.mat(aMat, 1)); + + if (aIsCobbleTarget) { + RM.pack(OP.rockGt.mat(aMat, 4), aBlock); + CR.shaped(aBlock, CR.DEF_NCC, "BB", "BB", 'B', OP.rockGt.dat(aMat)); + } } if (ST.valid(aStair)) { CR.shaped(ST.amount(4, aStair), CR.DEF_NCC_MIR, "sB", "BB", 'B', aBlock); @@ -330,11 +332,14 @@ public static ItemStack stoneshapes(OreDictMaterial aMat, boolean aIsCobbleTarge if (ST.valid(aStair)) { CR.remout(aStair); - RM.Shredder.addRecipe1(T, 16, 16, aStair, OP.dustSmall.mat(aMat,27)); - if (aIsCobbleTarget) { - RM.pack(OP.rockGt.mat(aMat, 3), aStair); - CR.shaped(aStair, CR.DEF_NCC_MIR, " B", "BB", 'B', OP.rockGt.dat(aMat)); + if (aMat != null) { + RM.Shredder.addRecipe1(T, 16, 16, aStair, OP.dustSmall.mat(aMat, 27)); + + if (aIsCobbleTarget) { + RM.pack(OP.rockGt.mat(aMat, 3), aStair); + CR.shaped(aStair, CR.DEF_NCC_MIR, " B", "BB", 'B', OP.rockGt.dat(aMat)); + } } if (ST.valid(aSlabs)) { CR.shaped(aSlabs, CR.DEF_NCC, "sB", 'B', aStair); @@ -344,11 +349,14 @@ public static ItemStack stoneshapes(OreDictMaterial aMat, boolean aIsCobbleTarge if (ST.valid(aSlabs)) { CR.remout(aSlabs); - RM.Shredder.addRecipe1(T, 16, 16, aSlabs, OP.dustSmall.mat(aMat,18)); - if (aIsCobbleTarget) { - RM.pack(OP.rockGt.mat(aMat, 2), aSlabs); - CR.shaped(aSlabs, CR.DEF_NCC, "BB", 'B', OP.rockGt.dat(aMat)); + if (aMat != null) { + RM.Shredder.addRecipe1(T, 16, 16, aSlabs, OP.dustSmall.mat(aMat, 18)); + + if (aIsCobbleTarget) { + RM.pack(OP.rockGt.mat(aMat, 2), aSlabs); + CR.shaped(aSlabs, CR.DEF_NCC, "BB", 'B', OP.rockGt.dat(aMat)); + } } if (ST.valid(aStair)) { CR.shaped(ST.amount(2, aStair), CR.DEF_NCC_MIR, "sB", "BB", 'B', aSlabs); @@ -357,58 +365,65 @@ public static ItemStack stoneshapes(OreDictMaterial aMat, boolean aIsCobbleTarge if (ST.valid(aWalls)) { CR.remout(aWalls); - RM.Shredder.addRecipe1(T, 16, 16, aWalls, OP.blockDust.mat(aMat, 1)); - if (aIsCobbleTarget) { - CR.shaped(aWalls, CR.DEF_NCC, " B ", "BBB", 'B', OP.rockGt.dat(aMat)); + if (aMat != null) { + RM.Shredder.addRecipe1(T, 16, 16, aWalls, OP.blockDust.mat(aMat, 1)); + + if (aIsCobbleTarget) { + CR.shaped(aWalls, CR.DEF_NCC, " B ", "BBB", 'B', OP.rockGt.dat(aMat)); + } } } if (ST.valid(aPillar)) { CR.remout(aPillar); - RM.Shredder.addRecipe1(T, 16, 16, aPillar, OP.blockDust.mat(aMat, 1)); - if (aIsCobbleTarget) { - CR.shaped(aPillar, CR.DEF_NCC, "BBB", " B ", 'B', OP.rockGt.dat(aMat)); + if (aMat != null) { + RM.Shredder.addRecipe1(T, 16, 16, aPillar, OP.blockDust.mat(aMat, 1)); + + if (aIsCobbleTarget) { + CR.shaped(aPillar, CR.DEF_NCC, "BBB", " B ", 'B', OP.rockGt.dat(aMat)); + } } } return aBlock; } - public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, ItemStack aStone, ItemStack aCobble, ItemStack aBricks, ItemStack aCracked, ItemStack aChiseled, ItemStack aSmooth, ItemStack aTiles, ItemStack aBricks2) { - + public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, ItemStack aFourRocks, ItemStack aDustBlock, ItemStack aStone, ItemStack aCobble, ItemStack aBricks, ItemStack aCracked, ItemStack aChiseled, ItemStack aSmooth, ItemStack aTiles, ItemStack aBricks2) { for (ItemStack tStack : ST.array(aStone, aCobble, aBricks, aCracked, aChiseled, aSmooth, aTiles, aBricks2)) if (ST.valid(tStack)) { - RM.Shredder.addRecipe1(T, 16, 16, tStack, OP.blockDust.mat(aMat, 1)); + RM.Shredder.addRecipe1(T, 16, 16, tStack, aDustBlock); } - for (ItemStack tStack : ST.array(aStone, aCobble, aSmooth)) if (ST.valid(tStack)) { - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Plate .get(0), OP.plate.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Plate_Curved.get(0), OP.plateCurved.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Rod .get(0), OP.stick.mat(aMat, 18)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Rod_Long .get(0), OP.stickLong.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Bolt .get(0), OP.bolt.mat(aMat, 64)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Shovel .get(0), OP.toolHeadRawShovel.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Sword .get(0), OP.toolHeadRawSword.mat(aMat, 4)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Hoe .get(0), OP.toolHeadRawHoe.mat(aMat, 4)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Pickaxe .get(0), OP.toolHeadRawPickaxe.mat(aMat, 3)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Axe .get(0), OP.toolHeadRawAxe.mat(aMat, 3)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Gear .get(0), OP.gearGt.mat(aMat, 2)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Gear_Small .get(0), OP.gearGtSmall.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Hammer .get(0), OP.toolHeadHammer.mat(aMat, 1)); - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Plate .get(0), OP.plate.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Plate_Curved.get(0), OP.plateCurved.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Rod .get(0), OP.stick.mat(aMat, 18)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Rod_Long .get(0), OP.stickLong.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Bolt .get(0), OP.bolt.mat(aMat, 64)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Shovel .get(0), OP.toolHeadRawShovel.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Sword .get(0), OP.toolHeadRawSword.mat(aMat, 4)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Hoe .get(0), OP.toolHeadRawHoe.mat(aMat, 4)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Pickaxe .get(0), OP.toolHeadRawPickaxe.mat(aMat, 3)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Axe .get(0), OP.toolHeadRawAxe.mat(aMat, 3)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Gear .get(0), OP.gearGt.mat(aMat, 2)); - RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Gear_Small .get(0), OP.gearGtSmall.mat(aMat, 9)); - RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Hammer .get(0), OP.toolHeadHammer.mat(aMat, 1)); + for (ItemStack tStack : ST.array(aStone, aCobble, aSmooth, aDustBlock)) if (ST.valid(tStack)) { + if (aMat != null) { + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Plate.get(0), OP.plate.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Plate_Curved.get(0), OP.plateCurved.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Rod.get(0), OP.stick.mat(aMat, 18)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Rod_Long.get(0), OP.stickLong.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Bolt.get(0), OP.bolt.mat(aMat, 64)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Shovel.get(0), OP.toolHeadRawShovel.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Sword.get(0), OP.toolHeadRawSword.mat(aMat, 4)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Hoe.get(0), OP.toolHeadRawHoe.mat(aMat, 4)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Pickaxe.get(0), OP.toolHeadRawPickaxe.mat(aMat, 3)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Axe.get(0), OP.toolHeadRawAxe.mat(aMat, 3)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Gear.get(0), OP.gearGt.mat(aMat, 2)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Gear_Small.get(0), OP.gearGtSmall.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Hammer.get(0), OP.toolHeadHammer.mat(aMat, 1)); + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Plate.get(0), OP.plate.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Plate_Curved.get(0), OP.plateCurved.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Rod.get(0), OP.stick.mat(aMat, 18)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Rod_Long.get(0), OP.stickLong.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Bolt.get(0), OP.bolt.mat(aMat, 64)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Shovel.get(0), OP.toolHeadRawShovel.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Sword.get(0), OP.toolHeadRawSword.mat(aMat, 4)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Hoe.get(0), OP.toolHeadRawHoe.mat(aMat, 4)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Pickaxe.get(0), OP.toolHeadRawPickaxe.mat(aMat, 3)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Axe.get(0), OP.toolHeadRawAxe.mat(aMat, 3)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Gear.get(0), OP.gearGt.mat(aMat, 2)); + RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Gear_Small.get(0), OP.gearGtSmall.mat(aMat, 9)); + RM.Extruder.addRecipe2(F, F, F, F, F, 16, 32, ST.amount(1, tStack), IL.Shape_SimpleEx_Hammer.get(0), OP.toolHeadHammer.mat(aMat, 1)); + } if (ST.valid(aStone)) { RM.Extruder.addRecipe2(F, F, F, F, T, 16, 32, ST.amount(1, tStack), IL.Shape_Extruder_Block .get(0), aStone); @@ -429,15 +444,15 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite if (ST.valid(aStone)) { RM.generify(aStone, ST.make(Blocks.stone, 1, 0)); - if (aIsMatTarget) { - RM.add_smelting(OP.blockDust.mat(aMat, 1), aStone, F, F, F); + if (aIsMatTarget && ST.valid(aDustBlock)) { + RM.add_smelting(aDustBlock, aStone, F, F, F); } if (ST.valid(aCobble)) { RM.Hammer .addRecipe1(T, 16, 16, aStone, aCobble); RM.Crusher .addRecipe1(T, 16, 16, aStone, aCobble); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aStone, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aStone, OP.rockGt.mat(aMat, 4)); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aStone, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aStone, aFourRocks); } if (ST.valid(aBricks)) { CR.shaped(ST.amount(4, aBricks), CR.DEF_REM, "XX", "XX", 'X', aStone ); @@ -458,10 +473,11 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite if (ST.valid(aCobble)) { RM.generify(aCobble, ST.make(Blocks.cobblestone, 1, 0)); - RM.Hammer .addRecipe1(T, 16, 16, 8000, aCobble, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16 , aCobble, OP.rockGt.mat(aMat, 4)); - - if (aIsMatTarget) { + if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, 8000, aCobble, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16 , aCobble, aFourRocks); + } + if (aIsMatTarget && aMat != null) { RM.pack(OP.rockGt.mat(aMat, 4), aCobble); CR.shaped(aCobble, CR.DEF_NCC, "BB", "BB", 'B', OP.rockGt.dat(aMat)); } @@ -493,11 +509,11 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite RM.Crusher .addRecipe1(T, 16, 16, aBricks, aCobble); CR.shaped(aCobble, CR.DEF_REM, "h" , "X" , 'X', aBricks); CR.shaped(aCobble, CR.DEF_REM, "y" , "X" , 'X', aBricks); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aBricks, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aBricks, OP.rockGt.mat(aMat, 4)); - CR.shaped(OP.rockGt.mat(aMat, 4), CR.DEF_REM, "h" , "X" , 'X', aBricks); - CR.shaped(OP.rockGt.mat(aMat, 4), CR.DEF_REM, "y" , "X" , 'X', aBricks); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aBricks, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aBricks, aFourRocks); + CR.shaped(aFourRocks, CR.DEF_REM, "h" , "X" , 'X', aBricks); + CR.shaped(aFourRocks, CR.DEF_REM, "y" , "X" , 'X', aBricks); } if (ST.valid(aBricks2)) { CR.shaped(ST.amount(4, aBricks2), CR.DEF_REM, "XX", "XX", 'X', aBricks); @@ -507,8 +523,10 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite if (ST.valid(aCracked)) { CR.remout(aCracked); RM.generify(aCracked, ST.make(Blocks.stonebrick, 1, 2)); - RM.Hammer .addRecipe1(T, 16, 16, 7000, aCracked, OP.rockGt.mat(aMat, 4)); + if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, 7000, aCracked, aFourRocks); + } if (ST.valid(aStone)) { RM.add_smelting(aCracked, aStone, T, F, F); } else if (ST.valid(aSmooth)) { @@ -516,8 +534,8 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite } if (ST.valid(aCobble)) { RM.Crusher .addRecipe1(T, 16, 16, aCracked, aCobble); - } else { - RM.Crusher .addRecipe1(T, 16, 16, aCracked, OP.rockGt.mat(aMat, 4)); + } else if (ST.valid(aFourRocks)) { + RM.Crusher .addRecipe1(T, 16, 16, aCracked, aFourRocks); } } @@ -533,9 +551,9 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite if (ST.valid(aCobble)) { RM.Hammer .addRecipe1(T, 16, 16, aChiseled, aCobble); RM.Crusher .addRecipe1(T, 16, 16, aChiseled, aCobble); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aChiseled, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aChiseled, OP.rockGt.mat(aMat, 4)); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aChiseled, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aChiseled, aFourRocks); } } @@ -545,15 +563,15 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite if (ST.valid(aStone)) { RM.add_smelting(aSmooth, aStone, T, F, F); - } else if (aIsMatTarget) { - RM.add_smelting(OP.blockDust.mat(aMat, 1), aSmooth, T, F, F); + } else if (aIsMatTarget && ST.valid(aDustBlock)) { + RM.add_smelting(aDustBlock, aSmooth, T, F, F); } if (ST.valid(aCobble)) { RM.Hammer .addRecipe1(T, 16, 16, aSmooth, aCobble); RM.Crusher .addRecipe1(T, 16, 16, aSmooth, aCobble); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aSmooth, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aSmooth, OP.rockGt.mat(aMat, 4)); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aSmooth, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aSmooth, aFourRocks); } if (ST.valid(aBricks)) { CR.shaped(ST.amount(4, aBricks), CR.DEF_REM, "XX", "XX", 'X', aSmooth); @@ -584,9 +602,9 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite } else if (ST.valid(aCobble)) { RM.Hammer .addRecipe1(T, 16, 16, aTiles, aCobble); RM.Crusher .addRecipe1(T, 16, 16, aTiles, aCobble); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aTiles, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aTiles, OP.rockGt.mat(aMat, 4)); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aTiles, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aTiles, aFourRocks); } } @@ -614,11 +632,11 @@ public static boolean stonetypes(OreDictMaterial aMat, boolean aIsMatTarget, Ite RM.Crusher .addRecipe1(T, 16, 16, aBricks2, aCobble); CR.shaped(aCobble, CR.DEF_REM, "h" , "X" , 'X', aBricks2); CR.shaped(aCobble, CR.DEF_REM, "y" , "X" , 'X', aBricks2); - } else { - RM.Hammer .addRecipe1(T, 16, 16, aBricks2, OP.rockGt.mat(aMat, 4)); - RM.Crusher .addRecipe1(T, 16, 16, aBricks2, OP.rockGt.mat(aMat, 4)); - CR.shaped(OP.rockGt.mat(aMat, 4), CR.DEF_REM, "h" , "X" , 'X', aBricks2); - CR.shaped(OP.rockGt.mat(aMat, 4), CR.DEF_REM, "y" , "X" , 'X', aBricks2); + } else if (ST.valid(aFourRocks)) { + RM.Hammer .addRecipe1(T, 16, 16, aBricks2, aFourRocks); + RM.Crusher .addRecipe1(T, 16, 16, aBricks2, aFourRocks); + CR.shaped(aFourRocks, CR.DEF_REM, "h" , "X" , 'X', aBricks2); + CR.shaped(aFourRocks, CR.DEF_REM, "y" , "X" , 'X', aBricks2); } } return T; diff --git a/src/main/java/gregtech/compat/Compat_Recipes_AppliedEnergistics.java b/src/main/java/gregtech/compat/Compat_Recipes_AppliedEnergistics.java index 0a7704fe3..7d40a68a2 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_AppliedEnergistics.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_AppliedEnergistics.java @@ -1,5 +1,5 @@ /** - * Copyright (c) 2022 GregTech-6 Team + * Copyright (c) 2023 GregTech-6 Team * * This file is part of GregTech. * @@ -48,13 +48,8 @@ public class Compat_Recipes_AppliedEnergistics extends CompatMods { CR.shaped(ST.make(MD.AE, "tile.BlockQuartzGlass", 4, 0), CR.DEF_REM_REV_NCC, "QGQ", "GQG", "QGQ", 'G', OD.blockGlassColorless, 'Q', OP.dust.dat(ANY.Quartz)); CR.shaped(ST.make(MD.AE, "tile.BlockQuartzLamp" , 1, 0), CR.DEF_REM_REV_NCC, "GQG", 'G', OP.dust.dat(ANY.Glowstone), 'Q', ST.make(MD.AE, "tile.BlockQuartzGlass", 1, 0)); - RM.add_smelting(ST.make(MD.AE, "item.ItemMultiMaterial", 1, 45), ST.make(MD.AE, "tile.BlockSkyStone", 1, 0), F, F, F); - RM.Mixer .addRecipeX(T, 16, 16, ST.array(OM.dust(MT.Olivine), OM.dust(MT.RareEarth), OM.dust(MT.STONES.Basalt), OM.dust(MT.Obsidian)), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 45)); - RM.Shredder .addRecipe1(T, 64, 16, ST.make(MD.AE, "tile.BlockSkyStone", 1, W), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 45)); - RM.Shredder .addRecipe1(T, 64, 128, ST.make(MD.AE, "tile.BlockSkyChest", 1, W), ST.make(MD.AE, "item.ItemMultiMaterial", 8, 45)); - RM.Press .addRecipe2(T, 16, 64, ST.make(MD.AE, "item.ItemMultiMaterial", 0, 13), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 10), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 16)); RM.Press .addRecipe2(T, 16, 64, ST.make(MD.AE, "item.ItemMultiMaterial", 0, 13), OP.plateGem.mat(MT.CertusQuartz , 1), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 16)); for (OreDictMaterial tMat : ANY.Diamond.mToThis) @@ -120,6 +115,24 @@ public class Compat_Recipes_AppliedEnergistics extends CompatMods { RM.smash(ST.make(MD.AE, "tile.ChiseledQuartzSlabBlock" , 1, W), OP.gem.mat(MT.CertusQuartz, 2)); RM.smash(ST.make(MD.AE, "tile.FluixSlabBlock" , 1, W), OP.gem.mat(MT.Fluix, 2)); + + RM.stonetypes(null, F, NI, NI + , RM.stoneshapes(null, F, ST.make(MD.AE, "tile.BlockSkyStone" , 1, 0), ST.make(MD.AE, "tile.SkyStoneStairBlock" , 1, 0), ST.make(MD.AE, "tile.SkyStoneSlabBlock" , 1, 0), NI, NI) + , NI + , RM.stoneshapes(null, F, ST.make(MD.AE, "tile.BlockSkyStone" , 1, 2), ST.make(MD.AE, "tile.SkyStoneBrickStairBlock" , 1, 0), ST.make(MD.AE, "tile.SkyStoneBrickSlabBlock" , 1, 0), NI, NI) + , NI + , NI + , RM.stoneshapes(null, F, ST.make(MD.AE, "tile.BlockSkyStone" , 1, 1), ST.make(MD.AE, "tile.SkyStoneBlockStairBlock" , 1, 0), ST.make(MD.AE, "tile.SkyStoneBlockSlabBlock" , 1, 0), NI, NI) + , NI + , RM.stoneshapes(null, F, ST.make(MD.AE, "tile.BlockSkyStone" , 1, 3), ST.make(MD.AE, "tile.SkyStoneSmallBrickStairBlock", 1, 0), ST.make(MD.AE, "tile.SkyStoneSmallBrickSlabBlock", 1, 0), NI, NI) + ); + + RM.add_smelting(ST.make(MD.AE, "item.ItemMultiMaterial", 1, 45), ST.make(MD.AE, "tile.BlockSkyStone", 1, 0), F, F, F); + RM.mortarize( 2, ST.make(MD.AE, "tile.BlockSkyStone", 1, W), ST.make(MD.AE, "item.ItemMultiMaterial", 1, 45)); + RM.mortarize(16, ST.make(MD.AE, "tile.BlockSkyChest", 1, W), ST.make(MD.AE, "item.ItemMultiMaterial", 8, 45)); + + + new OreDictListenerEvent_Names() {@Override public void addAllListeners() { addListener("gemCertusQuartz", new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) { RM.ae_grinder(10, aEvent.mStack, OP.dust.mat(MT.CertusQuartz, 1)); diff --git a/src/main/java/gregtech/compat/Compat_Recipes_Betweenlands.java b/src/main/java/gregtech/compat/Compat_Recipes_Betweenlands.java index 2180128d7..16f2d96c4 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_Betweenlands.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_Betweenlands.java @@ -92,7 +92,7 @@ public class Compat_Recipes_Betweenlands extends CompatMods { RM.moss(ST.make(MD.BTL, "betweenstoneTiles" , 1, 0), ST.make(MD.BTL, "betweenstoneTilesMossy" , 1, 0)); RM.moss(ST.make(MD.BTL, "betweenstoneBricks" , 1, 0), ST.make(MD.BTL, "betweenstoneBricksMossy" , 1, 0)); - RM.stonetypes(MT.STONES.Limestone, F + RM.stonetypes(MT.STONES.Limestone, F, OP.rockGt.mat(MT.STONES.Limestone, 4), OP.blockDust.mat(MT.STONES.Limestone, 1) , RM.stoneshapes(MT.STONES.Limestone, F, ST.make(MD.BTL, "limestone" , 1, 0), ST.make(MD.BTL, "limestoneStairs" , 1, 0), ST.make(MD.BTL, "Limestone Slab" , 1, 0), ST.make(MD.BTL, "limestoneWall" , 1, 0), ST.make(MD.BTL, "limestonePillar" , 1, 0)) , NI , RM.stoneshapes(MT.STONES.Limestone, F, ST.make(MD.BTL, "limestoneBricks" , 1, 0), ST.make(MD.BTL, "limestoneBrickStairs" , 1, 0), ST.make(MD.BTL, "Limestone Brick Slab" , 1, 0), ST.make(MD.BTL, "limestoneBrickWall" , 1, 0), NI) @@ -106,7 +106,7 @@ public class Compat_Recipes_Betweenlands extends CompatMods { RM.stoneshapes(MT.STONES.Betweenstone, F, ST.make(MD.BTL, "betweenstoneBricksMossy" , 1, 0), ST.make(MD.BTL, "betweenstoneBrickStairsMossy" , 1, 0), ST.make(MD.BTL, "Mossy Betweenstone Brick Slab" , 1, 0), ST.make(MD.BTL, "betweenstoneBrickWallMossy" , 1, 0), NI); RM.stoneshapes(MT.STONES.Betweenstone, F, ST.make(MD.BTL, "betweenstoneSmoothMossy" , 1, 0), ST.make(MD.BTL, "betweenstoneSmoothStairsMossy" , 1, 0), ST.make(MD.BTL, "Mossy Smooth Betweenstone Slab" , 1, 0), ST.make(MD.BTL, "smoothBetweenstoneWallMossy" , 1, 0), NI); - RM.stonetypes(MT.STONES.Betweenstone, T + RM.stonetypes(MT.STONES.Betweenstone, T, OP.rockGt.mat(MT.STONES.Betweenstone, 4), OP.blockDust.mat(MT.STONES.Betweenstone, 1) , RM.stoneshapes(MT.STONES.Betweenstone, F, ST.make(MD.BTL, "smoothBetweenstone" , 1, 0), ST.make(MD.BTL, "smoothBetweenstoneStairs" , 1, 0), ST.make(MD.BTL, "Smooth Betweenstone Slab" , 1, 0), ST.make(MD.BTL, "smoothBetweenstoneWall" , 1, 0), ST.make(MD.BTL, "betweenstonePillar" , 1, 0)) , ST.make(MD.BTL, "betweenstone" , 1, 0) , RM.stoneshapes(MT.STONES.Betweenstone, F, ST.make(MD.BTL, "betweenstoneBricks" , 1, 0), ST.make(MD.BTL, "betweenstoneBrickStairs" , 1, 0), ST.make(MD.BTL, "Betweenstone Brick Slab" , 1, 0), ST.make(MD.BTL, "betweenstoneBrickWall" , 1, 0), NI) @@ -118,7 +118,7 @@ public class Compat_Recipes_Betweenlands extends CompatMods { ); - RM.stonetypes(MT.STONES.Pitstone, T + RM.stonetypes(MT.STONES.Pitstone, T, OP.rockGt.mat(MT.STONES.Pitstone, 4), OP.blockDust.mat(MT.STONES.Pitstone, 1) , ST.make(MD.BTL, "pitstone" , 1, 0) , RM.stoneshapes(MT.STONES.Pitstone, T, ST.make(MD.BTL, "pitstoneBricks" , 1, 0), ST.make(MD.BTL, "pitstoneBrickStairs" , 1, 0), ST.make(MD.BTL, "Pitstone Brick Slab" , 1, 0), ST.make(MD.BTL, "pitstoneBrickWall" , 1, 0), NI) , ST.make(MD.BTL, "pitstoneTiles" , 1, 0) @@ -130,7 +130,7 @@ public class Compat_Recipes_Betweenlands extends CompatMods { ); - RM.stonetypes(MT.STONES.Cragrock, T + RM.stonetypes(MT.STONES.Cragrock, T, OP.rockGt.mat(MT.STONES.Cragrock, 4), OP.blockDust.mat(MT.STONES.Cragrock, 1) , RM.stoneshapes(MT.STONES.Cragrock, F, ST.make(MD.BTL, "smoothCragrock" , 1, 0), ST.make(MD.BTL, "smoothCragrockStairs" , 1, 0), ST.make(MD.BTL, "Smooth Cragrock Slab" , 1, 0), ST.make(MD.BTL, "smoothCragrockWall" , 1, 0), ST.make(MD.BTL, "cragrockPillar" , 1, 0)) , ST.make(MD.BTL, "genericStone" , 1, 1) , RM.stoneshapes(MT.STONES.Cragrock, F, ST.make(MD.BTL, "cragrockBrick" , 1, 0), ST.make(MD.BTL, "cragrockBrickStairs" , 1, 0), ST.make(MD.BTL, "Cragrock Brick Slab" , 1, 0), ST.make(MD.BTL, "cragrockWall" , 1, 0), NI) @@ -142,7 +142,7 @@ public class Compat_Recipes_Betweenlands extends CompatMods { ); - RM.stonetypes(MT.STONES.Templerock, T + RM.stonetypes(MT.STONES.Templerock, T, OP.rockGt.mat(MT.STONES.Templerock, 4), OP.blockDust.mat(MT.STONES.Templerock, 1) , NI , NI , RM.stoneshapes(MT.STONES.Templerock, F, ST.make(MD.BTL, "templeBrick" , 1, 0), ST.make(MD.BTL, "templeBrickStairs" , 1, 0), ST.make(MD.BTL, "Temple Brick Slab" , 1, 0), ST.make(MD.BTL, "templeBrickWall" , 1, 0), ST.make(MD.BTL, "templePillar" , 1, 0)) diff --git a/src/main/java/gregtech/compat/Compat_Recipes_BiomesOPlenty.java b/src/main/java/gregtech/compat/Compat_Recipes_BiomesOPlenty.java index 13988195d..0a1973c21 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_BiomesOPlenty.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_BiomesOPlenty.java @@ -66,9 +66,9 @@ public class Compat_Recipes_BiomesOPlenty extends CompatMods { CR.shapeless(OP.dust.mat(MT.White, 1), DEF, new Object[] {IL.BoP_Bone_Small}); CR.shapeless(OP.dust.mat(MT.White, 2), DEF, new Object[] {IL.BoP_Bone_Medium}); CR.shapeless(OP.dust.mat(MT.White, 4), DEF, new Object[] {IL.BoP_Bone_Large}); - RM.Mortar .addRecipe1(T, 16, 16, IL.BoP_Bone_Small.get(1), IL.Dye_Bonemeal.get(2)); - RM.Mortar .addRecipe1(T, 16, 32, IL.BoP_Bone_Medium.get(1), IL.Dye_Bonemeal.get(4)); - RM.Mortar .addRecipe1(T, 16, 64, IL.BoP_Bone_Large.get(1), IL.Dye_Bonemeal.get(8)); + RM.mortarize(2, IL.BoP_Bone_Small.get(1), IL.Dye_Bonemeal.get(2)); + RM.mortarize(4, IL.BoP_Bone_Medium.get(1), IL.Dye_Bonemeal.get(4)); + RM.mortarize(8, IL.BoP_Bone_Large.get(1), IL.Dye_Bonemeal.get(8)); RM.smash(IL.BoP_Hard_Ice.get(1), OM.dust(MT.Ice, 2*U)); RM.Squeezer .addRecipe1(T, 16, 128, IL.BoP_Hard_Ice.get(1), NF, FL.Ice.make(2000), NI); @@ -85,15 +85,14 @@ public class Compat_Recipes_BiomesOPlenty extends CompatMods { RM.Juicer .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 0), OM.dust(MT.WaxBee, U*4)); RM.Juicer .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 2), OM.dust(MT.WaxBee, U*4)); RM.Juicer .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 3), NF, FL.Honey.make(360), OM.dust(MT.WaxBee, U*4)); - RM.Mortar .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 0), OM.dust(MT.WaxBee, U*4)); - RM.Mortar .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 2), OM.dust(MT.WaxBee, U*4)); - RM.Mortar .addRecipe1(T, 16, 256, ST.make(MD.BoP, "hive", 1, 3), OM.dust(MT.WaxBee, U*4)); - + RM.mortarize(4, ST.make(MD.BoP, "hive", 1, 0), OM.dust(MT.WaxBee, U*4)); + RM.mortarize(4, ST.make(MD.BoP, "hive", 1, 2), OM.dust(MT.WaxBee, U*4)); + RM.mortarize(4, ST.make(MD.BoP, "hive", 1, 3), OM.dust(MT.WaxBee, U*4)); RM.unpack(ST.make(MD.BoP, "hive", 1, 0), IL.BoP_Comb.get(4)); RM.unpack(ST.make(MD.BoP, "hive", 1, 2), IL.BoP_Comb.get(4)); RM.unpack(ST.make(MD.BoP, "hive", 1, 3), IL.BoP_HoneyComb.get(4)); - RM.Shredder.addRecipe1(T, 16, 16, ST.make(MD.BoP, "mushrooms" , 1, 0), IL.BoP_ShroomPowder.get(2)); + RM.mortarize(ST.make(MD.BoP, "mushrooms", 1, 0), IL.BoP_ShroomPowder.get(2)); RM.Squeezer.addRecipe1(T, 16, 16, ST.make(MD.BoP, "mushrooms" , 1, 0), IL.BoP_ShroomPowder.get(2)); RM.Squeezer.addRecipe1(T, 16, 16, ST.make(MD.BoP, "mushrooms" , 1, 2), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Blue], IL.BoP_Dye_Blue.get(1)); @@ -156,8 +155,39 @@ public class Compat_Recipes_BiomesOPlenty extends CompatMods { RM.Juicer.addRecipe1(T, 16, 16, ST.make(MD.BoP, "flowers2" , 1, 8), NF, DYE_FLUIDS_FLOWER[DYE_INDEX_Red], ST.make(Items.dye, 1, DYE_INDEX_Red)); + RM.stonetypes(MT.STONES.Limestone, F, OP.rockGt.mat(MT.STONES.Limestone, 4), OP.blockDust.mat(MT.STONES.Limestone, 1) + , ST.make(MD.BoP, "rocks", 1, 0) + , NI + , NI + , NI + , NI + , ST.make(MD.BoP, "rocks", 1, 1) + , NI + , NI + ); + + RM.stonetypes(MT.STONES.Siltstone, F, OP.rockGt.mat(MT.STONES.Siltstone, 4), OP.blockDust.mat(MT.STONES.Siltstone, 1) + , ST.make(MD.BoP, "rocks", 1, 2) + , NI + , NI + , NI + , NI + , ST.make(MD.BoP, "rocks", 1, 3) + , NI + , NI + ); + + RM.stonetypes(MT.STONES.Shale, F, OP.rockGt.mat(MT.STONES.Shale, 4), OP.blockDust.mat(MT.STONES.Shale, 1) + , ST.make(MD.BoP, "rocks", 1, 4) + , NI + , NI + , NI + , NI + , ST.make(MD.BoP, "rocks", 1, 5) + , NI + , NI + ); - RM.mortarize(ST.make(MD.BoP, "mushrooms", 1, 0), IL.BoP_ShroomPowder.get(2)); if (ENABLE_ADDING_IC2_EXTRACTOR_RECIPES) { RM.ic2_extractor(ST.make(MD.BoP, "mushrooms" , 1, 0), IL.BoP_ShroomPowder.get(2)); diff --git a/src/main/java/gregtech/compat/Compat_Recipes_Bluepower.java b/src/main/java/gregtech/compat/Compat_Recipes_Bluepower.java index 24f18e067..e57c655d8 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_Bluepower.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_Bluepower.java @@ -40,7 +40,7 @@ public class Compat_Recipes_Bluepower extends CompatMods { for (OreDictMaterial tMat : ANY.Iron.mToThis) RM.Press.addRecipeX(T, 16, 256, ST.array((tMat==MT.Enori?OP.plateGem:OP.plate).mat(tMat, 1), OP.foil.mat(MT.Zn, 2)), ST.make(MD.BP, "zincplate", 2, 0)); // The Project Table is a liability more than a useful thing. Use a less laggy Table like the one from Better Storage if you need to. - CR.remout(MD.BP, "project_table", "auto_project_table", "tiles"); + CR.remout(MD.BP, "project_table", "auto_project_table", "circuit_table", "tiles"); CR.shaped(ST.make(MD.BP, "iron_wire" , 1, 0), CR.DEF_REV_NCC, "XXX", "X X", "XXX", 'X', OP.wireFine.dat(ANY.Fe)); CR.shaped(ST.make(MD.BP, "copper_wire" , 1, 0), CR.DEF_REV_NCC, "XXX", "X X", "XXX", 'X', OP.wireFine.dat(ANY.Cu)); @@ -48,7 +48,7 @@ public class Compat_Recipes_Bluepower extends CompatMods { CR.shaped(ST.make(MD.BP, "red_doped_wafer" , 4, 0), CR.DEF_NCC , "X ", " s" , 'X', OP.plateGem.dat(MT.RedstoneAlloy)); CR.shaped(ST.make(MD.BP, "blue_doped_wafer" , 4, 0), CR.DEF_NCC , "X ", " s" , 'X', OP.plateGem.dat(MT.NikolineAlloy)); - CR.shaped(ST.make(MD.BP, "tiles" , 1, 0), CR.DEF_NCC_MIR, "XY", "YX" , 'X', OP.plate.dat(MT.STONES.Basalt), 'X', OP.plate.dat(MT.STONES.Marble)); + CR.shaped(ST.make(MD.BP, "tiles" , 1, 0), CR.DEF_NCC_MIR, "XY", "YX" , 'X', OP.plate.dat(MT.STONES.Basalt), 'Y', OP.plate.dat(MT.STONES.Marble)); CR.shaped(ST.make(MD.BP, "circuit_table" , 1, 0), CR.DEF_NCC , "PDP", "PCP", "PWP", 'P', OD.plankAnyWood, 'C', OD.craftingChest, 'W', OD.craftingWorkBench, 'D', OP.plate.dat(MT.NikolineAlloy)); RM.biomass(ST.make(MD.BP, "indigo_flower", 16, 0)); @@ -66,24 +66,24 @@ public class Compat_Recipes_Bluepower extends CompatMods { RM.sawing(64, 64, F, 1000, ST.make(MD.BP, "silicon_boule", 1, 0), ST.make(MD.BP, "silicon_wafer", 16, 0)); - RM.stonetypes(MT.STONES.Marble, F + RM.stonetypes(MT.STONES.Marble, F, OP.rockGt.mat(MT.STONES.Marble, 4), OP.blockDust.mat(MT.STONES.Marble, 1) , ST.make(MD.BP, "marble", 1, 0) , NI , ST.make(MD.BP, "marble_brick", 1, 0) , NI , ST.make(MD.BP, "fancy_marble", 1, 0) - , ST.make(MD.BP, "basalt_paver", 1, 0) + , ST.make(MD.BP, "marble_paver", 1, 0) , ST.make(MD.BP, "marble_tile", 1, 0) , ST.make(MD.BP, "marble_brick_small", 1, 0) ); - RM.stonetypes(MT.STONES.Basalt, F + RM.stonetypes(MT.STONES.Basalt, F, OP.rockGt.mat(MT.STONES.Basalt, 4), OP.blockDust.mat(MT.STONES.Basalt, 1) , ST.make(MD.BP, "basalt", 1, 0) , ST.make(MD.BP, "basalt_cobble", 1, 0) , ST.make(MD.BP, "basalt_brick", 1, 0) , ST.make(MD.BP, "basaltbrick_cracked", 1, 0) , ST.make(MD.BP, "fancy_basalt", 1, 0) - , ST.make(MD.BP, "marble_paver", 1, 0) + , ST.make(MD.BP, "basalt_paver", 1, 0) , ST.make(MD.BP, "basalt_tile", 1, 0) , ST.make(MD.BP, "basalt_brick_small", 1, 0) ); diff --git a/src/main/java/gregtech/compat/Compat_Recipes_Erebus.java b/src/main/java/gregtech/compat/Compat_Recipes_Erebus.java index 716341fff..b8decde30 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_Erebus.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_Erebus.java @@ -89,7 +89,7 @@ public class Compat_Recipes_Erebus extends CompatMods { RM.stoneshapes(MT.STONES.Umber, F, ST.make(MD.ERE, "umberstone", 1, 3), ST.make(MD.ERE, "umbercobbleStairs3", 1, 0), ST.make(MD.ERE, "slab-umberstone3" , 1, 0), ST.make(MD.ERE, "wallErebus" , 1, 3), NI); RM.stoneshapes(MT.STONES.Umber, F, ST.make(MD.ERE, "umberPaver", 1, 1), NI , ST.make(MD.ERE, "slab-umberPaver1" , 1, 0), ST.make(MD.ERE, "wallErebus" , 1, 6), NI); RM.stoneshapes(MT.STONES.Umber, F, ST.make(MD.ERE, "umberPaver", 1, 2), NI , NI , ST.make(MD.ERE, "wallErebus" , 1, 7), NI); - RM.stonetypes(MT.STONES.Umber, T + RM.stonetypes(MT.STONES.Umber, T, OP.rockGt.mat(MT.STONES.Umber, 4), OP.blockDust.mat(MT.STONES.Umber, 1) , RM.stoneshapes(MT.STONES.Umber, F, ST.make(MD.ERE, "umberstone", 1, 0), ST.make(MD.ERE, "umbercobbleStairs0", 1, 0), ST.make(MD.ERE, "slab-umberstone0" , 1, 0), ST.make(MD.ERE, "wallErebus" , 1, 0), NI) , RM.stoneshapes(MT.STONES.Umber, T, ST.make(MD.ERE, "umberstone", 1, 1), ST.make(MD.ERE, "umbercobbleStairs1", 1, 0), ST.make(MD.ERE, "slab-umberstone1" , 1, 0), ST.make(MD.ERE, "wallErebus" , 1, 1), NI) , RM.stoneshapes(MT.STONES.Umber, F, ST.make(MD.ERE, "umberstone", 1, 4), ST.make(MD.ERE, "umbercobbleStairs4", 1, 0), ST.make(MD.ERE, "slab-umberstone4" , 1, 0), ST.make(MD.ERE, "wallErebus" , 1, 4), NI) @@ -101,7 +101,7 @@ public class Compat_Recipes_Erebus extends CompatMods { ); - RM.stonetypes(MT.STONES.Gneiss, F + RM.stonetypes(MT.STONES.Gneiss, F, OP.rockGt.mat(MT.STONES.Gneiss, 4), OP.blockDust.mat(MT.STONES.Gneiss, 1) , RM.stoneshapes(MT.STONES.Gneiss, F, ST.make(MD.ERE, "gneiss", 1, 0), ST.make(MD.ERE, "gneissStairs0", 1, 0), NI, NI, NI) , NI , RM.stoneshapes(MT.STONES.Gneiss, F, ST.make(MD.ERE, "gneiss", 1, 3), ST.make(MD.ERE, "gneissStairs3", 1, 0), NI, NI, NI) diff --git a/src/main/java/gregtech/compat/Compat_Recipes_ProjectRed.java b/src/main/java/gregtech/compat/Compat_Recipes_ProjectRed.java index f88d9311f..a2657fda0 100644 --- a/src/main/java/gregtech/compat/Compat_Recipes_ProjectRed.java +++ b/src/main/java/gregtech/compat/Compat_Recipes_ProjectRed.java @@ -41,7 +41,7 @@ public class Compat_Recipes_ProjectRed extends CompatMods { RM.sawing(64, 64, F, 1000, ST.make(MD.PR, "projectred.core.part", 1, 11), ST.make(MD.PR, "projectred.core.part", 16, 12)); - RM.stonetypes(MT.STONES.Marble, F + RM.stonetypes(MT.STONES.Marble, F, OP.rockGt.mat(MT.STONES.Marble, 4), OP.blockDust.mat(MT.STONES.Marble, 1) , ST.make(MD.PR_EXPLORATION, "projectred.exploration.stone", 1, 0) , NI , NI @@ -52,7 +52,7 @@ public class Compat_Recipes_ProjectRed extends CompatMods { , NI ); - RM.stonetypes(MT.STONES.Basalt, F + RM.stonetypes(MT.STONES.Basalt, F, OP.rockGt.mat(MT.STONES.Basalt, 4), OP.blockDust.mat(MT.STONES.Basalt, 1) , ST.make(MD.PR_EXPLORATION, "projectred.exploration.stone", 1, 3) , ST.make(MD.PR_EXPLORATION, "projectred.exploration.stone", 1, 2) , NI