Gregorius Techneticies 3 months ago
parent
commit
3a2cca858e
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 18
- 10
src/main/java/gregapi/load/LoaderItemData.java View File

@@ -812,20 +812,28 @@ public class LoaderItemData implements Runnable {
812 812
 		for (byte i = 0; i < 16; i++) OM.reg(OP.dyeMixable.mNameInternal + DYE_OREDICTS_POST[i], ST.make(Items.dye, 1, i));
813 813
 		
814 814
 		if (MD.PFAA.mLoaded) {
815
+			OM.reg(OD.blockClay             , ST.make(MD.PFAA, "weakClay"   , 1,  0));
816
+			OM.reg(OD.blockClay             , ST.make(MD.PFAA, "weakOreClay", 1,  1));
817
+			OM.reg(OD.blockClay             , ST.make(MD.PFAA, "weakOreClay", 1,  2));
818
+			OM.reg(OD.blockClay             , ST.make(MD.PFAA, "weakOreClay", 1,  3));
819
+			OM.data(MD.PFAA, "weakClay"   , 1,  0, MT.ClayBrown             , U*4);
820
+			OM.data(MD.PFAA, "weakOreClay", 1,  1, MT.Bentonite             , U*4);
821
+			OM.data(MD.PFAA, "weakOreClay", 1,  2, MT.Palygorskite          , U*4);
822
+			OM.data(MD.PFAA, "weakOreClay", 1,  3, MT.Kaolinite             , U*4);
823
+			
815 824
 			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 45));
816 825
 			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 47));
817 826
 			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 48));
818 827
 			OM.reg(OD.itemClay              , ST.make(MD.PFAA, "earthyClump", 1, 49));
819
-			
820
-			OM.data(MD.PFAA, "earthyClump", 1,  37, MT.OREMATS.YellowLimonite, U);
821
-			OM.data(MD.PFAA, "earthyClump", 1,  45, MT.ClayBrown             , U);
822
-			OM.data(MD.PFAA, "earthyClump", 1,  46, MT.OREMATS.Bauxite       , U);
823
-			OM.data(MD.PFAA, "earthyClump", 1,  47, MT.Bentonite             , U);
824
-			OM.data(MD.PFAA, "earthyClump", 1,  48, MT.Palygorskite          , U);
825
-			OM.data(MD.PFAA, "earthyClump", 1,  49, MT.Kaolinite             , U);
826
-			OM.data(MD.PFAA, "earthyClump", 1,  50, MT.OREMATS.BrownLimonite , U);
827
-			OM.data(MD.PFAA, "earthyClump", 1,  51, MT.OREMATS.YellowLimonite, U);
828
-			OM.data(MD.PFAA, "earthyClump", 1,  52, MT.OREMATS.Vermiculite   , U);
828
+			OM.data(MD.PFAA, "earthyClump", 1, 37, MT.OREMATS.YellowLimonite, U);
829
+			OM.data(MD.PFAA, "earthyClump", 1, 45, MT.ClayBrown             , U);
830
+			OM.data(MD.PFAA, "earthyClump", 1, 46, MT.OREMATS.Bauxite       , U);
831
+			OM.data(MD.PFAA, "earthyClump", 1, 47, MT.Bentonite             , U);
832
+			OM.data(MD.PFAA, "earthyClump", 1, 48, MT.Palygorskite          , U);
833
+			OM.data(MD.PFAA, "earthyClump", 1, 49, MT.Kaolinite             , U);
834
+			OM.data(MD.PFAA, "earthyClump", 1, 50, MT.OREMATS.BrownLimonite , U);
835
+			OM.data(MD.PFAA, "earthyClump", 1, 51, MT.OREMATS.YellowLimonite, U);
836
+			OM.data(MD.PFAA, "earthyClump", 1, 52, MT.OREMATS.Vermiculite   , U);
829 837
 			
830 838
 			for (String tName : new String [] {"weakStone", "weakRubble"}) {
831 839
 				OM.reg(OP.stone, MT.Stone                       , ST.make(MD.PFAA, tName, 1,  0)); // Breccia

+ 1
- 1
src/main/java/gregapi/oredict/OreDictManager.java View File

@@ -115,7 +115,7 @@ public final class OreDictManager {
115 115
 	, "hempBrick", "hempBlock", "savehempBrick", "savehempBlock", "saveplatedHempBrick", "saveplatedHempBlock", "platedHempBrick", "platedHempBlock", "platedHemp", "savehemp", "saveplatedHemp"
116 116
 	);
117 117
 	/** Lists all Names which should not be processed due to technical Issues. */
118
-	private final Set<String> mIgnoredNames = new HashSetNoNulls<>(F, "dustRefinedObsidian", "dustRefinedGlowstone", "oreNetherQuartz", "oreBasalticMineralSand", "oreLifeCrystal", "cropMaplesyrup", "oreTritanium", "oreDuranium", "plateLapis", "shardEntropy", "shardAir", "shardWater", "shardEarth", "shardFire", "shardOrder", "greggy_greg_do_please_kindly_stuff_a_sock_in_it", "halfSheetCylinderMetal", "halfSheetMetal", "quarterSheetMetal", "sheetCurvedFourMetal", "sheetCurvedOneMetal", "sheetCurvedThreeMetal", "sheetCurvedTwoMetal", "sheetCylinderMetal", "sheetMediumConeMetal", "sheetMetal", "sheetMicroConeMetal", "sheetMicroFinMetal", "sheetSmallConeMetal", "sheetSmallCylinderMetal", "sheetSmallFinMetal", "shirtSheetMetal", "rivetSheetMetal", "triangleSheetMetal");
118
+	private final Set<String> mIgnoredNames = new HashSetNoNulls<>(F, "oreBentonite", "oreFullersEarth", "oreKaolinite", "dustRefinedObsidian", "dustRefinedGlowstone", "oreNetherQuartz", "oreBasalticMineralSand", "oreLifeCrystal", "cropMaplesyrup", "oreTritanium", "oreDuranium", "plateLapis", "shardEntropy", "shardAir", "shardWater", "shardEarth", "shardFire", "shardOrder", "greggy_greg_do_please_kindly_stuff_a_sock_in_it", "halfSheetCylinderMetal", "halfSheetMetal", "quarterSheetMetal", "sheetCurvedFourMetal", "sheetCurvedOneMetal", "sheetCurvedThreeMetal", "sheetCurvedTwoMetal", "sheetCylinderMetal", "sheetMediumConeMetal", "sheetMetal", "sheetMicroConeMetal", "sheetMicroFinMetal", "sheetSmallConeMetal", "sheetSmallCylinderMetal", "sheetSmallFinMetal", "shirtSheetMetal", "rivetSheetMetal", "triangleSheetMetal");
119 119
 	/** Lists all Names which have already been registered. Used for the OreDict Listeners, so that certain Recipes (such as Crafting) don't get registered twice.*/
120 120
 	private final Set<String> mAlreadyRegisteredNames = new HashSetNoNulls<>();
121 121
 	/** Used to check if Recipe Outputs accidentally contain uncopied OreDict Items. */

+ 27
- 27
src/main/java/gregtech/items/MultiItemFood.java View File

@@ -149,33 +149,33 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
149 149
 		RM.add_smelting(IL.Clay_Ball_Yellow.get(1), ST.make(Items.brick, 1, 0));
150 150
 		RM.add_smelting(IL.Clay_Ball_Blue  .get(1), ST.make(Items.brick, 1, 0));
151 151
 		RM.add_smelting(IL.Clay_Ball_White .get(1), ST.make(Items.brick, 1, 0));
152
-		CR.shaped   (OP.plate.mat(MT.Clay         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', Items.clay_ball);
153
-		CR.shaped   (OP.plate.mat(MT.ClayBrown    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Brown);
154
-		CR.shaped   (OP.plate.mat(MT.ClayRed      , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Red);
155
-		CR.shaped   (OP.plate.mat(MT.Bentonite    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Yellow);
156
-		CR.shaped   (OP.plate.mat(MT.Palygorskite , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Blue);
157
-		CR.shaped   (OP.plate.mat(MT.Kaolinite    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_White);
158
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Mud_Ball);
159
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 1), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Brown);
160
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 3), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Red);
161
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 4), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Yellow);
162
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 5), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Blue);
163
-		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 6), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_White);
164
-		CR.shaped   (ST.make(Blocks.clay       , 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', Items.clay_ball);
165
-		CR.shapeless(IL.Mud_Ball               .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 0)});
166
-		CR.shapeless(IL.Clay_Ball_Brown        .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 1)});
167
-		CR.shapeless(IL.Clay_Ball_Red          .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 3)});
168
-		CR.shapeless(IL.Clay_Ball_Yellow       .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 4)});
169
-		CR.shapeless(IL.Clay_Ball_Blue         .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 5)});
170
-		CR.shapeless(IL.Clay_Ball_White        .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 6)});
171
-		CR.shapeless(ST.make(Items.clay_ball   , 4, 0), CR.DEF_NAC_NCC, new Object[] {Blocks.clay});
172
-		RM.packunpack(IL.Mud_Ball              .get(4), ST.make(BlocksGT.Diggables, 1, 0));
173
-		RM.packunpack(IL.Clay_Ball_Brown       .get(4), ST.make(BlocksGT.Diggables, 1, 1));
174
-		RM.packunpack(IL.Clay_Ball_Red         .get(4), ST.make(BlocksGT.Diggables, 1, 3));
175
-		RM.packunpack(IL.Clay_Ball_Yellow      .get(4), ST.make(BlocksGT.Diggables, 1, 4));
176
-		RM.packunpack(IL.Clay_Ball_Blue        .get(4), ST.make(BlocksGT.Diggables, 1, 5));
177
-		RM.packunpack(IL.Clay_Ball_White       .get(4), ST.make(BlocksGT.Diggables, 1, 6));
178
-		RM.packunpack(ST.make(Items.clay_ball  , 4, 0), ST.make(Blocks.clay       , 1, 0));
152
+		CR.shaped    (OP.plate.mat(MT.Clay         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', Items.clay_ball);
153
+		CR.shaped    (OP.plate.mat(MT.ClayBrown    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Brown);
154
+		CR.shaped    (OP.plate.mat(MT.ClayRed      , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Red);
155
+		CR.shaped    (OP.plate.mat(MT.Bentonite    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Yellow);
156
+		CR.shaped    (OP.plate.mat(MT.Palygorskite , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Blue);
157
+		CR.shaped    (OP.plate.mat(MT.Kaolinite    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_White);
158
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Mud_Ball);
159
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 1), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Brown);
160
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 3), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Red);
161
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 4), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Yellow);
162
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 5), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Blue);
163
+		CR.shaped    (ST.make(BlocksGT.Diggables, 1, 6), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_White);
164
+		CR.shaped    (ST.make(Blocks.clay       , 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', Items.clay_ball);
165
+		CR.shapeless (IL.Mud_Ball               .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 0)});
166
+		CR.shapeless (IL.Clay_Ball_Brown        .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 1)});
167
+		CR.shapeless (IL.Clay_Ball_Red          .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 3)});
168
+		CR.shapeless (IL.Clay_Ball_Yellow       .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 4)});
169
+		CR.shapeless (IL.Clay_Ball_Blue         .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 5)});
170
+		CR.shapeless (IL.Clay_Ball_White        .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 6)});
171
+		CR.shapeless (ST.make(Items.clay_ball   , 4, 0), CR.DEF_NAC_NCC, new Object[] {Blocks.clay});
172
+		RM.packunpack(IL.Mud_Ball               .get(4), ST.make(BlocksGT.Diggables, 1, 0));
173
+		RM.packunpack(IL.Clay_Ball_Brown        .get(4), ST.make(BlocksGT.Diggables, 1, 1));
174
+		RM.packunpack(IL.Clay_Ball_Red          .get(4), ST.make(BlocksGT.Diggables, 1, 3));
175
+		RM.packunpack(IL.Clay_Ball_Yellow       .get(4), ST.make(BlocksGT.Diggables, 1, 4));
176
+		RM.packunpack(IL.Clay_Ball_Blue         .get(4), ST.make(BlocksGT.Diggables, 1, 5));
177
+		RM.packunpack(IL.Clay_Ball_White        .get(4), ST.make(BlocksGT.Diggables, 1, 6));
178
+		RM.packunpack(ST.make(Items.clay_ball   , 4, 0), ST.make(Blocks.clay       , 1, 0));
179 179
 		RM.RollBender.addRecipe1(T, 16, 32, ST.make(Items.clay_ball   , 1, 0), OP.plate.mat(MT.Clay        , 1));
180 180
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Brown        .get(1), OP.plate.mat(MT.ClayBrown   , 1));
181 181
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Red          .get(1), OP.plate.mat(MT.ClayRed     , 1));

+ 14
- 6
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -559,12 +559,20 @@ public class Loader_Worldgen implements Runnable {
559 559
 		new WorldgenBlackSand       ("river.magnetite"         , T, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS);
560 560
 		new WorldgenTurf            ("swamp.turf"              , T, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT);
561 561
 		
562
-		new WorldgenPit             ("pit.clay.vanilla"        , T, Blocks.clay       , 0, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
563
-		new WorldgenPit             ("pit.clay.brown"          , T, BlocksGT.Diggables, 1, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
564
-		new WorldgenPit             ("pit.clay.red"            , F, BlocksGT.Diggables, 3, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM); // Disabled by default because it's supposed to be only in the Nether
565
-		new WorldgenPit             ("pit.clay.yellow"         , T, BlocksGT.Diggables, 4, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
566
-		new WorldgenPit             ("pit.clay.blue"           , T, BlocksGT.Diggables, 5, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
567
-		new WorldgenPit             ("pit.clay.white"          , T, BlocksGT.Diggables, 6, 1, 320, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
562
+		int tChance = 320;
563
+		if (MD.PFAA.mLoaded) {
564
+		tChance = 512;
565
+		new WorldgenPit             ("pit.clay.pfaa.lateric"   , T, ST.block(MD.PFAA, "weakClay"   ), 0, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
566
+		new WorldgenPit             ("pit.clay.pfaa.bentonite" , T, ST.block(MD.PFAA, "weakOreClay"), 1, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
567
+		new WorldgenPit             ("pit.clay.pfaa.fullers"   , T, ST.block(MD.PFAA, "weakOreClay"), 2, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
568
+		new WorldgenPit             ("pit.clay.pfaa.kaolinite" , T, ST.block(MD.PFAA, "weakOreClay"), 3, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
569
+		}
570
+		new WorldgenPit             ("pit.clay.vanilla"        , T, Blocks.clay                     , 0, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
571
+		new WorldgenPit             ("pit.clay.brown"          , T, BlocksGT.Diggables              , 1, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
572
+		new WorldgenPit             ("pit.clay.red"            , F, BlocksGT.Diggables              , 3, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM); // Disabled by default because it's supposed to be only in the Nether
573
+		new WorldgenPit             ("pit.clay.yellow"         , T, BlocksGT.Diggables              , 4, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
574
+		new WorldgenPit             ("pit.clay.blue"           , T, BlocksGT.Diggables              , 5, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
575
+		new WorldgenPit             ("pit.clay.white"          , T, BlocksGT.Diggables              , 6, 1, tChance, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
568 576
 		
569 577
 		new WorldgenNetherClay      ("nether.clay.red"         , T, GEN_NETHER);
570 578
 		new WorldgenNetherQuartz    ("nether.netherquartz"     , T, GEN_NETHER);

+ 54
- 0
src/main/java/gregtech/loaders/c/Loader_Recipes_Temporary.java View File

@@ -25,6 +25,7 @@ import static gregapi.util.CR.*;
25 25
 
26 26
 import gregapi.data.ANY;
27 27
 import gregapi.data.CS.FluidsGT;
28
+import gregapi.data.CS.OreDictToolNames;
28 29
 import gregapi.data.FL;
29 30
 import gregapi.data.IL;
30 31
 import gregapi.data.MD;
@@ -33,6 +34,7 @@ import gregapi.data.OD;
33 34
 import gregapi.data.OP;
34 35
 import gregapi.data.RM;
35 36
 import gregapi.oredict.OreDictItemData;
37
+import gregapi.oredict.OreDictMaterial;
36 38
 import gregapi.oredict.event.IOreDictListenerEvent;
37 39
 import gregapi.oredict.event.OreDictListenerEvent_Names;
38 40
 import gregapi.util.CR;
@@ -153,6 +155,7 @@ public class Loader_Recipes_Temporary implements Runnable {
153 155
 			}};
154 156
 		}
155 157
 		
158
+		
156 159
 		if (MD.HEE.mLoaded) {
157 160
 			RM.biomass(ST.make(MD.HEE, "crossed_decoration", 8, W));
158 161
 			RM.biomass(ST.make(MD.HEE, "death_flower"      , 8, W));
@@ -175,6 +178,15 @@ public class Loader_Recipes_Temporary implements Runnable {
175 178
 		}
176 179
 		
177 180
 		
181
+		if (MD.MO.mLoaded) {
182
+			RM.LaserEngraver.addRecipe2(T, 16, 1000, ST.make(MD.MO, "isolinear_circuit", 1, 0), OP.plate.mat(MT.Au, 1), ST.make(MD.MO, "isolinear_circuit", 1, 1));
183
+			for (OreDictMaterial tMat : ANY.Diamond.mToThis)
184
+			RM.LaserEngraver.addRecipe2(T, 32, 1000, ST.make(MD.MO, "isolinear_circuit", 1, 1), OP.plateGem.mat(tMat, 1), ST.make(MD.MO, "isolinear_circuit", 1, 2));
185
+			for (OreDictMaterial tMat : ANY.Emerald.mToThis)
186
+			RM.LaserEngraver.addRecipe2(T, 64, 1000, ST.make(MD.MO, "isolinear_circuit", 1, 2), OP.plateGem.mat(tMat, 1), ST.make(MD.MO, "isolinear_circuit", 1, 3));
187
+		}
188
+		
189
+		
178 190
 		if (MD.HBM.mLoaded) {
179 191
 			CR.delate(MD.HBM, "item.apple_lead", "item.apple_schrabidium", "item.apple_euphemium");
180 192
 			
@@ -199,6 +211,7 @@ public class Loader_Recipes_Temporary implements Runnable {
199 211
 			}};
200 212
 		}
201 213
 		
214
+		
202 215
 		if (MD.NeLi.mLoaded) {
203 216
 			CR.delate(IL.NeLi_Bread.get(1));
204 217
 			CR.delate(IL.NeLi_Cookie.get(1));
@@ -392,6 +405,7 @@ public class Loader_Recipes_Temporary implements Runnable {
392 405
 			CR.shaped(IL.NeLi_Blackstone.get(1), DEF, "XX", "XX", 'X', rockGt.dat(MT.Blackstone));
393 406
 		}
394 407
 		
408
+		
395 409
 		if (MD.NePl.mLoaded) {
396 410
 			CR.delate(MD.NePl, "SoulTorch", "NetheriteIngot", "ItemNetheriteSword", "NetheritePickaxe", "ItemNetheriteShovel", "ItemNetheriteAxe", "ItemNetheriteHoe", "NetheriteHelm", "NetheriteChest", "NetheriteLegg", "NetheriteBoots");
397 411
 			
@@ -430,6 +444,46 @@ public class Loader_Recipes_Temporary implements Runnable {
430 444
 		
431 445
 		
432 446
 		if (MD.PFAA.mLoaded) {
447
+			RM.generify(ST.make(MD.PFAA, "earthyClump", 1, 45), ST.make(Items.clay_ball, 1, 0));
448
+			RM.generify(ST.make(MD.PFAA, "earthyClump", 1, 47), ST.make(Items.clay_ball, 1, 0));
449
+			RM.generify(ST.make(MD.PFAA, "earthyClump", 1, 48), ST.make(Items.clay_ball, 1, 0));
450
+			RM.generify(ST.make(MD.PFAA, "earthyClump", 1, 49), ST.make(Items.clay_ball, 1, 0));
451
+			RM.add_smelting(ST.make(MD.PFAA, "earthyClump", 1, 45), ST.make(Items.brick, 1, 0));
452
+			RM.add_smelting(ST.make(MD.PFAA, "earthyClump", 1, 47), ST.make(Items.brick, 1, 0));
453
+			RM.add_smelting(ST.make(MD.PFAA, "earthyClump", 1, 48), ST.make(Items.brick, 1, 0));
454
+			RM.add_smelting(ST.make(MD.PFAA, "earthyClump", 1, 49), ST.make(Items.brick, 1, 0));
455
+			CR.shaped    (OP.plate.mat(MT.ClayBrown         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', ST.make(MD.PFAA, "earthyClump", 4, 45));
456
+			CR.shaped    (OP.plate.mat(MT.Bentonite         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', ST.make(MD.PFAA, "earthyClump", 4, 47));
457
+			CR.shaped    (OP.plate.mat(MT.Palygorskite      , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', ST.make(MD.PFAA, "earthyClump", 4, 48));
458
+			CR.shaped    (OP.plate.mat(MT.Kaolinite         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', ST.make(MD.PFAA, "earthyClump", 4, 49));
459
+			CR.shapeless (ST.make(MD.PFAA, "earthyClump", 4, 45), CR.DEF_NAC_NCC, new Object[] {ST.make(MD.PFAA, "weakClay"   , 1,  0)});
460
+			CR.shapeless (ST.make(MD.PFAA, "earthyClump", 4, 47), CR.DEF_NAC_NCC, new Object[] {ST.make(MD.PFAA, "weakOreClay", 1,  1)});
461
+			CR.shapeless (ST.make(MD.PFAA, "earthyClump", 4, 48), CR.DEF_NAC_NCC, new Object[] {ST.make(MD.PFAA, "weakOreClay", 1,  2)});
462
+			CR.shapeless (ST.make(MD.PFAA, "earthyClump", 4, 49), CR.DEF_NAC_NCC, new Object[] {ST.make(MD.PFAA, "weakOreClay", 1,  3)});
463
+			RM.packunpack(ST.make(MD.PFAA, "earthyClump", 4, 45), ST.make(MD.PFAA, "weakClay"   , 1,  0));
464
+			RM.packunpack(ST.make(MD.PFAA, "earthyClump", 4, 47), ST.make(MD.PFAA, "weakOreClay", 1,  1));
465
+			RM.packunpack(ST.make(MD.PFAA, "earthyClump", 4, 48), ST.make(MD.PFAA, "weakOreClay", 1,  2));
466
+			RM.packunpack(ST.make(MD.PFAA, "earthyClump", 4, 49), ST.make(MD.PFAA, "weakOreClay", 1,  3));
467
+			RM.RollBender.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 1, 45), OP.plate.mat(MT.ClayBrown   , 1));
468
+			RM.RollBender.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 1, 47), OP.plate.mat(MT.Bentonite   , 1));
469
+			RM.RollBender.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 1, 48), OP.plate.mat(MT.Palygorskite, 1));
470
+			RM.RollBender.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 1, 49), OP.plate.mat(MT.Kaolinite   , 1));
471
+			RM.Compressor.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 4, 45), ST.make(MD.PFAA, "weakClay"   , 1,  0));
472
+			RM.Compressor.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 4, 47), ST.make(MD.PFAA, "weakOreClay", 1,  1));
473
+			RM.Compressor.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 4, 48), ST.make(MD.PFAA, "weakOreClay", 1,  2));
474
+			RM.Compressor.addRecipe1(T, 16, 32, ST.make(MD.PFAA, "earthyClump", 4, 49), ST.make(MD.PFAA, "weakOreClay", 1,  3));
475
+			RM.Mortar    .addRecipe1(T, 16, 16, ST.make(MD.PFAA, "earthyClump", 1, 45), OM.dust(MT.ClayBrown));
476
+			RM.Mortar    .addRecipe1(T, 16, 16, ST.make(MD.PFAA, "earthyClump", 1, 47), OM.dust(MT.Bentonite));
477
+			RM.Mortar    .addRecipe1(T, 16, 16, ST.make(MD.PFAA, "earthyClump", 1, 48), OM.dust(MT.Palygorskite));
478
+			RM.Mortar    .addRecipe1(T, 16, 16, ST.make(MD.PFAA, "earthyClump", 1, 49), OM.dust(MT.Kaolinite));
479
+			RM.Mortar    .addRecipe1(T, 16, 64, ST.make(MD.PFAA, "weakClay"   , 1,  0), OM.dust(MT.ClayBrown, U*4));
480
+			RM.Mortar    .addRecipe1(T, 16, 64, ST.make(MD.PFAA, "weakOreClay", 1,  1), OM.dust(MT.Bentonite, U*4));
481
+			RM.Mortar    .addRecipe1(T, 16, 64, ST.make(MD.PFAA, "weakOreClay", 1,  2), OM.dust(MT.Palygorskite, U*4));
482
+			RM.Mortar    .addRecipe1(T, 16, 64, ST.make(MD.PFAA, "weakOreClay", 1,  3), OM.dust(MT.Kaolinite, U*4));
483
+			
484
+			
485
+			
486
+			
433 487
 			RM.Sifting          .addRecipe1(T, 16, 200, new long[] {9900, 500, 500}                    , IL.PFAA_Sands.getWithMeta(1, 0), dust.mat(MT.OREMATS.BasalticMineralSand, 2), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1));
434 488
 			RM.MagneticSeparator.addRecipe1(T, 16, 144, new long[] {9900, 500, 500, 500}               , IL.PFAA_Sands.getWithMeta(1, 0), dust.mat(MT.OREMATS.BasalticMineralSand, 2), rockGt.mat(MT.Basalt, 1), nugget.mat(MT.Au, 1), dustTiny.mat(MT.Au, 2));
435 489
 			RM.Centrifuge       .addRecipe1(T, 16, 256, new long[] {9000, 1000}                        , IL.PFAA_Sands.getWithMeta(1, 0), dust.mat(MT.OREMATS.BasalticMineralSand, 2), dust.mat(MT.V2O5, 2));

Loading…
Cancel
Save