Browse Source

Added White Clay and fixed some Clay related Bugs. Also Porcelain is changed a bit

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

+ 5
- 1
CHANGELOG.md View File

@@ -19,11 +19,15 @@ Nothing (I tend to only add finished Stuff to the Changelog).
19 19
 [CHANGED] Air Vents now do 256000L per 360 ticks at a time, instead of only 16000. They have an Offset for ticking too now, so you can use multiple Vents on one Pipe/Drum/etc now.
20 20
 [CHANGED] There is now more Galena Veins in the World, and visible on the Surface in Mountains.
21 21
 [CHANGED] A bunch of Ores, that I deemed way too useless years ago, has been added back. None of them are required for anything, old Worlds are safe as always. ;)
22
-[ADDED] Bentonite Clay and Palygorskite Clay (try to say that 3 times fast), which are Yellow and Blue Clay. The only reason I did this, is because I noticed PFAA added those, and they were long dormant in my Ore Materials Section (I did not think of them as Clays back then), so now I gave them Life! Please take note that I changed the Electrolyzation Output of Clay, and that Vanilla Clay does no longer give Lithium. Only Brown Clay does.
23 22
 [ADDED] Crushed Purified Biotite can now be heated in the Dryer to make Argon Gas from it. It is mostly a Byproduct of other Ores like Asbestos though,
24 23
 [ADDED] Gypsum, Trona and Mirabilite now have Recipes to create them by mixing some Chemicals with Water (They can be dried back too). Perlite now has a drying Recipe that turns it into Obsidian aswell.
25 24
 [ADDED] Iron and Hydrochloric Acid now have a few more Chemical Reactions. This will improve Hematite extraction from Limonite. Oh and Limonite now smelts into Hematite, like it does in real Life, so it is no longer an easy Shortcut, like it was before.
26 25
 [ADDED] Vanadiumsteel Fluid Pipe that can handle Acids and otherwise has the same Stats as Tungstensteel (which cannot handle Acids).
26
+[ADDED] Porcelain Cup Recipe. Now you dont need to rely on Loot anymore to get those small Cups.
27
+[ADDED]
28
+Bentonite Clay, Kaolinite Clay and Palygorskite Clay (try to say that 3 times fast), which are Yellow, White and Blue Clay.
29
+The only reason I did this, is because I noticed PFAA added those, and they were long dormant in my Ore Materials Section (I did not think of them as Clays back then), so now I gave them Life!
30
+Please take note that I changed the Electrolyzation Output of Clay, and that Vanilla Clay does no longer give Lithium. Only Brown Clay does.
27 31
 
28 32
 
29 33
 6.14.06:

+ 2
- 2
src/main/java/gregapi/data/IL.java View File

@@ -230,7 +230,7 @@ public enum IL implements IItemContainer {
230 230
 	Ceramic_Bowl, Ceramic_Bowl_Raw,
231 231
 	Measuring_Pot, Measuring_Pot_Raw,
232 232
 	Ceramic_Jug, Ceramic_Jug_Raw,
233
-	Porcelain_Cup,
233
+	Porcelain_Cup, Porcelain_Cup_Raw,
234 234
 	Compound_Bronze, Compound_Brass, Compound_BismuthBronze,
235 235
 	Pellet_Wood,
236 236
 	Bag_Sap_Resin,
@@ -361,7 +361,7 @@ public enum IL implements IItemContainer {
361 361
 	Bale_Wheat, Bale_Barley, Bale_Rye, Bale_Oats, Bale_AbyssalOats, Bale_Rice,
362 362
 	Grass, Grass_Dry, Grass_Moldy, Grass_Rotten, Bale, Bale_Dry, Bale_Moldy, Bale_Rotten,
363 363
 	Bark_Dry, Beam, Plank, Plank_Slab, Plank_Stairs, Treated_Planks, Treated_Planks_Slab,
364
-	Mud_Ball, Clay_Ball_Brown, Clay_Ball_Red, Clay_Ball_Yellow, Clay_Ball_Blue,
364
+	Mud_Ball, Clay_Ball_Brown, Clay_Ball_Red, Clay_Ball_Yellow, Clay_Ball_Blue, Clay_Ball_White,
365 365
 	Remains_Plant, Remains_Fruit, Remains_Veggie, Remains_Nut,
366 366
 	Schematic, Schematic_Crafting, Schematic_1by1, Schematic_2by2, Schematic_3by3,
367 367
 	Electrode_FR_Copper, Electrode_FR_Tin, Electrode_FR_Bronze, Electrode_FR_Iron, Electrode_FR_Gold, Electrode_FR_Diamond, Electrode_FR_Obsidian, Electrode_FR_Blaze, Electrode_FR_Rubber, Electrode_FR_Emerald, Electrode_FR_Apatite, Electrode_FR_Lapis, Electrode_FR_Ender,

+ 20
- 9
src/main/java/gregapi/data/MT.java View File

@@ -1090,11 +1090,12 @@ public class MT {
1090 1090
 	
1091 1091
 	
1092 1092
 	Ceramic                 = dustelec      ( 8225, "Ceramic"               , SET_ROUGH             , 220, 130,  70, 255, MORTAR, PLATES, BRITTLE)                                                                                                                  .uumMcfg(18, Al2O3          , 5*U, SiO2             ,12*U)                                                                                                  .heat(2000).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
1093
-	Clay                    = oredustdcmp   ( 8215, "Clay"                  , SET_ROUGH             , 200, 200, 220, 255, MORTAR, PLATES)                                                                                                                           .uumMcfg( 2, Ceramic        , 2*U, H2O              , 1*U)                                                                                                  .heat(2000).setSmelting(Ceramic, U),
1093
+	Clay                    = oredustdcmp   ( 8215, "Clay"                  , SET_ROUGH             , 200, 200, 220, 255, MORTAR, PLATES)                                                                                                                           .uumMcfg( 2, Ceramic        , 2*U, H2O              , 1*U)                                                                                                  .heat(2000).setSmelting(Ceramic, U), // please do note that I had to make it easier to generify Clays without causing too much transmutation, so the Clays are no longer accurate.
1094 1094
 	ClayBrown               = clay          ( 8276, "ClayBrown"                                     , 230, 140,  75, Li )                                                                                                                                                                                                                                                                                                       .setLocal("Brown Clay"),
1095 1095
 	ClayRed                 = clay          ( 8455, "ClayRed"                                       , 230,  40,  25, K  )                                                                                                                                                                                                                                                                                                       .setLocal("Red Clay"),
1096
-	Bentonite               = clay          ( 9153, "Bentonite"                                     , 255, 192,   4, Na )                                                                                                                                                                                                                                                                                                       .setLocal("Bentonite Clay"),    // (Na,Ca)0.33(Al,Mg)2(Si4O10)(OH)2 + n(H2O) please do note that I had to make it easier to generify Clays without causing too much transmutation, so it is no longer accurate.
1097
-	Palygorskite            = clay          ( 9154, "Palygorskite"                                  , 114, 157, 179, Ca , "FullersEarth")                                                                                                                                                                                                                                                                                       .setLocal("Palygorskite Clay"), //            (Al,Mg)2(Si4O10)(OH)  + 4(H2O)
1096
+	Bentonite               = clay          ( 9153, "Bentonite"                                     , 255, 192,   4, Na )                                                                                                                                                                                                                                                                                                       .setLocal("Bentonite Clay"),    // (Na,Ca)0.33(Al,Mg)2(Si4O10)(OH)2 + n(H2O)
1097
+	Palygorskite            = clay          ( 9154, "Palygorskite"                                  , 114, 157, 179, Mg , "FullersEarth")                                                                                                                                                                                                                                                                                       .setLocal("Palygorskite Clay"), //            (Al,Mg)2(Si4O10)(OH)  + 4(H2O)
1098
+	Kaolinite               = clay          ( 9167, "Kaolinite"                                     , 245, 235, 235, Ca )                                                                                                                                                                                                                                                                                                       .setLocal("Kaolinite Clay"),    // Al2Si2O5(OH)4
1098 1099
 	
1099 1100
 	
1100 1101
 	Porcelain               = mixdust       ( 8273, "Porcelain"             , SET_ROUGH             , 195, 195, 222, 255, PLATES, BRITTLE, MORTAR)                                                                                                                  .uumMcfg( 0, Ceramic        , 2*U, SiO2             , 1*U, PotassiumFeldspar, 1*U)                                                                          .heat(1800).setCompressing(null, 0).setBending(null, 0).setForging(null, 0).setSmashing(null, 0),
@@ -2321,6 +2322,7 @@ public class MT {
2321 2322
 			
2322 2323
 			Bentonite               .put(MD.PFAA);
2323 2324
 			Palygorskite            .put(MD.PFAA);
2325
+			Kaolinite               .put(MD.PFAA);
2324 2326
 			
2325 2327
 			
2326 2328
 			Angmallen               .put(MD.MET);
@@ -2618,7 +2620,7 @@ public class MT {
2618 2620
 			Pyrite                          .addOreByProducts(S                         , Phosphorus                , Fe2O3                 , OREMATS.Stannite      , Se                    );
2619 2621
 			Sn                              .addOreByProducts(OREMATS.Molybdenite       , OREMATS.Wolframite        , FluoriteBlack         , OREMATS.Arsenopyrite  , OREMATS.Stannite      , OREMATS.Sperrylite    , OREMATS.Huebnerite    , Apatite); // Tourmaline
2620 2622
 			OREMATS.Cassiterite             .addOreByProducts(OREMATS.Molybdenite       , OREMATS.Wolframite        , FluoriteWhite         , OREMATS.Arsenopyrite  , OREMATS.Stannite      , OREMATS.Sperrylite    , OREMATS.Huebnerite    , Apatite); // Tourmaline
2621
-			OREMATS.Bauxite                 .addOreByProducts(OREMATS.Kaolinite         , OREMATS.Ilmenite          , Fe2O3                 , Al2O3                 , AlO3H3                );
2623
+			OREMATS.Bauxite                 .addOreByProducts(Kaolinite                 , OREMATS.Ilmenite          , Fe2O3                 , Al2O3                 , AlO3H3                );
2622 2624
 			AlO3H3                          .addOreByProducts(OREMATS.Bauxite           , OREMATS.Ilmenite          , Fe2O3                 , Al2O3                 );
2623 2625
 			OREMATS.Ilmenite                .addOreByProducts(TiO2                      , Fe2O3                     , Mg                    , MnO2                  );
2624 2626
 			TiO2                            .addOreByProducts(Fe2O3                     , Nb                        , OREMATS.Tantalite     , Zircon                );
@@ -2630,6 +2632,7 @@ public class MT {
2630 2632
 			Ni                              .addOreByProducts(Co                        , Pt                        , Fe2O3                 );
2631 2633
 			OREMATS.Stannite                .addOreByProducts(Ge                        , Pyrite                    , OREMATS.Kesterite     );
2632 2634
 			OREMATS.Kesterite               .addOreByProducts(Ge                        , Pyrite                    , OREMATS.Stannite      );
2635
+			
2633 2636
 			OREMATS.Glauconite              .addOreByProducts(Na                        , Al2O3                     , Fe2O3                 );
2634 2637
 			OREMATS.Diatomite               .addOreByProducts(OREMATS.Mica              , Opal                      , Biotite               , OREMATS.Perlite       , Sapphire);
2635 2638
 			OREMATS.Mica                    .addOreByProducts(OREMATS.Vermiculite       , Asbestos                  , Biotite               , OREMATS.Perlite       );
@@ -2639,6 +2642,7 @@ public class MT {
2639 2642
 			Gypsum                          .addOreByProducts(OREMATS.Trona             , OREMATS.Mirabilite        , Asbestos              , Talc                  , S, Soapstone);
2640 2643
 			OREMATS.Mirabilite              .addOreByProducts(OREMATS.Trona             , Gypsum                    );
2641 2644
 			OREMATS.Trona                   .addOreByProducts(OREMATS.Mirabilite        , Gypsum                    );
2645
+			
2642 2646
 			Lapis                           .addOreByProducts(Lazurite                  , Sodalite                  , Pyrite                );
2643 2647
 			OREMATS.Cooperite               .addOreByProducts(Pd                        , Ni                        , Ir                    );
2644 2648
 			OREMATS.Cinnabar                .addOreByProducts(Redstone                  , S                         , Glowstone             , Se                    );
@@ -2647,10 +2651,13 @@ public class MT {
2647 2651
 			MnO2                            .addOreByProducts(OREMATS.Bromargyrite      , Fe2O3                     , OREMATS.Tantalite     , OREMATS.Chromite      );
2648 2652
 			OREMATS.Chromite                .addOreByProducts(MnO2                      , Fe2O3                     , Mg                    , OREMATS.Bromargyrite  );
2649 2653
 			OREMATS.Bromargyrite            .addOreByProducts(MnO2                      , Ag                        , OREMATS.Chromite      , OREMATS.Smithsonite   );
2654
+			
2650 2655
 			Phosphorus                      .addOreByProducts(Phosphorite               , Apatite                   , FluoriteYellow        , PO4                   );
2651 2656
 			Apatite                         .addOreByProducts(Phosphorite               , Phosphorus                , FluoriteBlue          , PO4                   );
2657
+			
2652 2658
 			OREMATS.Zeolite                 .addOreByProducts(OREMATS.Pollucite         , NaCl                      );
2653 2659
 			OREMATS.Pollucite               .addOreByProducts(OREMATS.Zeolite           , Cs                        , Rb                    );
2660
+			
2654 2661
 			Sapphire                        .addOreByProducts(Ruby                      , PurpleSapphire            , GreenSapphire         );
2655 2662
 			BlueSapphire                    .addOreByProducts(Ruby                      , PurpleSapphire            , GreenSapphire         );
2656 2663
 			GreenSapphire                   .addOreByProducts(Ruby                      , BlueSapphire              , YellowSapphire        );
@@ -2658,24 +2665,29 @@ public class MT {
2658 2665
 			OrangeSapphire                  .addOreByProducts(Ruby                      , BlueSapphire              , GreenSapphire         );
2659 2666
 			PurpleSapphire                  .addOreByProducts(Ruby                      , BlueSapphire              , GreenSapphire         );
2660 2667
 			Ruby                            .addOreByProducts(OrangeSapphire            , BlueSapphire              , GreenSapphire         );
2668
+			
2661 2669
 			HexoriumRed                     .addOreByProducts(HexoriumWhite             , HexoriumBlack             );
2662 2670
 			HexoriumGreen                   .addOreByProducts(HexoriumWhite             , HexoriumBlack             );
2663 2671
 			HexoriumBlue                    .addOreByProducts(HexoriumWhite             , HexoriumBlack             );
2664 2672
 			HexoriumBlack                   .addOreByProducts(HexoriumRed               , HexoriumGreen             , HexoriumBlue          );
2665 2673
 			HexoriumWhite                   .addOreByProducts(HexoriumRed               , HexoriumGreen             , HexoriumBlue          );
2666
-			Clay                            .addOreByProducts(OREMATS.Kaolinite         , Palygorskite              );
2674
+			
2675
+			Clay                            .addOreByProducts(Kaolinite                 , Palygorskite              );
2667 2676
 			ClayBrown                       .addOreByProducts(Clay                      , ClayRed                   );
2668 2677
 			ClayRed                         .addOreByProducts(Bentonite                 , ClayBrown                 );
2669 2678
 			Bentonite                       .addOreByProducts(ClayRed                   , Palygorskite              );
2670
-			Palygorskite                    .addOreByProducts(OREMATS.Kaolinite         , Bentonite                 );
2671
-			OREMATS.Kaolinite               .addOreByProducts(ClayBrown                 , Clay                      );
2679
+			Palygorskite                    .addOreByProducts(Kaolinite                 , Bentonite                 );
2680
+			Kaolinite                       .addOreByProducts(ClayBrown                 , Clay                      );
2681
+			
2672 2682
 			OREMATS.Barite                  .addOreByProducts(CertusQuartz              , Quartzite                 );
2673 2683
 			OREMATS.QuartzSand              .addOreByProducts(CertusQuartz              , Quartzite                 , OREMATS.Barite        );
2674 2684
 			OREMATS.Wollastonite            .addOreByProducts(Fe2O3                     , Mg                        , MnO2                  );
2685
+			
2675 2686
 			Redstone                        .addOreByProducts(OREMATS.Cinnabar          , RareEarth                 , Glowstone             );
2676 2687
 			Nikolite                        .addOreByProducts(Cu                        , RareEarth                 );
2677 2688
 			Teslatite                       .addOreByProducts(Cu                        , RareEarth                 );
2678 2689
 			Electrotine                     .addOreByProducts(Cu                        , RareEarth                 );
2690
+			
2679 2691
 			Os                              .addOreByProducts(Ir                        , Pt                        , Ru                    );
2680 2692
 			Ir                              .addOreByProducts(Pt                        , Os                        , Rh                    );
2681 2693
 			Pt                              .addOreByProducts(Ni                        , Ir                        , Pd                    );
@@ -3210,7 +3222,7 @@ public class MT {
3210 3222
 	/** The Section where I place regular Ores that are only used in advanced processing anyways due to complexity. */
3211 3223
 	public static class OREMATS {
3212 3224
 		@Deprecated @SuppressWarnings("hiding")
3213
-		public static final OreDictMaterial Pyrolusite = MnO2, Rutile = TiO2, Hematite = Fe2O3, Magnesite = MgCO3, Gypsum = MT.Gypsum, Bentonite = MT.Bentonite, FullersEarth = Palygorskite;
3225
+		public static final OreDictMaterial Pyrolusite = MnO2, Rutile = TiO2, Hematite = Fe2O3, Magnesite = MgCO3, Gypsum = MT.Gypsum, Bentonite = MT.Bentonite, FullersEarth = Palygorskite, Kaolinite = MT.Kaolinite;
3214 3226
 		
3215 3227
 		public static final OreDictMaterial
3216 3228
 		Magnetite               = oredustelec( 9122, "Magnetite"                 , SET_METALLIC  ,  30,  30,  30, 255, MORTAR, MELTING, MOLTEN, MAGNETIC_PASSIVE                                      )                         .uumMcfg( 0, Fe             , 3*U, O                , 4*U)                                                                                                .qual(0).heat(Fe.mMeltingPoint).aspects(TC.METALLUM, 2, TC.MAGNETO, 1),
@@ -3281,7 +3293,6 @@ public class MT {
3281 3293
 //      GlauconiteSand          = oredustelec( 9151, "Glauconite Sand"           , SET_DULL      , 130, 180,  60, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,10*U, K                , 1*U, Mg               , 2*U, H2O              , 3*U, O                , 7*U)                        , // (K,Na)(Fe3+,Al,Mg)2(Si,Al)4O10(OH)2
3282 3294
 		Vermiculite             = oredustelec( 9152, "Vermiculite"               , SET_METALLIC  , 200, 180,  15, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,10*U, Fe               , 3*U, SiO2             ,12*U, H2O              ,12*U, H                , 2*U)                        , // (Mg+2, Fe+2, Fe+3)3 [(AlSi)4O10] (OH)2 4H2O)
3283 3295
 		Mica                    = oredustelec( 9158, "Mica"                      , SET_FINE      , 195, 195, 205, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, K                , 2*U, SiO2             ,18*U, F                , 4*U)                                                , // KAl2(AlSi3O10)(F,OH)2
3284
-		Kaolinite               = oredustelec( 9167, "Kaolinite"                 , SET_DULL      , 245, 235, 235, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, SiO2             , 6*U, H2O              , 6*U)                                                                        , // Al2Si2O5(OH)4
3285 3296
 		Kyanite                 = oredustelec( 9166, "Kyanite"                   , SET_FLINT     , 110, 110, 250, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U)                                                                                                , // Al2SiO5
3286 3297
 		Alunite                 = oredustelec( 9162, "Alunite"                   , SET_METALLIC  , 225, 180,  65, 255, MORTAR, BLACKLISTED_SMELTER                                                    )                         .setMcfg( 0, Al2O3          ,15*U, KOH              , 6*U, SO3              ,16*U, H2O              ,15*U, O                , 9*U)                        , // KAl3(SO4)2(OH)6
3287 3298
 		

+ 1
- 1
src/main/java/gregapi/lang/LanguageHandler.java View File

@@ -489,7 +489,7 @@ public class LanguageHandler {
489 489
 			if (aPrefix == OP.plantGtFiber)                                 return aMaterial.mNameLocal + " String";
490 490
 			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + aMaterial.mNameLocal + " Dye";
491 491
 		} else
492
-		if (aMaterial == MT.Wax || aMaterial == MT.WaxMagic || aMaterial == MT.WaxAmnesic || aMaterial == MT.WaxSoulful || aMaterial == MT.WaxBee || aMaterial == MT.WaxRefractory || aMaterial == MT.WaxPlant || aMaterial == MT.WaxParaffin || aMaterial == MT.Ash || aMaterial == MT.DarkAsh || aMaterial == MT.VolcanicAsh || aMaterial == MT.ArcaneAsh || aMaterial == MT.ArcaneCompound || aMaterial == MT.OREMATS.Vermiculite || aMaterial == MT.OREMATS.Kaolinite || aMaterial == MT.Talc || aMaterial == MT.OREMATS.BasalticMineralSand || aMaterial == MT.OREMATS.GraniticMineralSand || aMaterial == MT.OREMATS.GarnetSand || aMaterial == MT.SluiceSand || aMaterial == MT.OREMATS.QuartzSand || aMaterial == MT.OREMATS.Pitchblende || aMaterial == MT.Bentonite || aMaterial == MT.Palygorskite || aMaterial == MT.RareEarth || aMaterial == MT.Oilsands) {
492
+		if (aMaterial == MT.Wax || aMaterial == MT.WaxMagic || aMaterial == MT.WaxAmnesic || aMaterial == MT.WaxSoulful || aMaterial == MT.WaxBee || aMaterial == MT.WaxRefractory || aMaterial == MT.WaxPlant || aMaterial == MT.WaxParaffin || aMaterial == MT.Ash || aMaterial == MT.DarkAsh || aMaterial == MT.VolcanicAsh || aMaterial == MT.ArcaneAsh || aMaterial == MT.ArcaneCompound || aMaterial == MT.OREMATS.Vermiculite || aMaterial == MT.Talc || aMaterial == MT.OREMATS.BasalticMineralSand || aMaterial == MT.OREMATS.GraniticMineralSand || aMaterial == MT.OREMATS.GarnetSand || aMaterial == MT.SluiceSand || aMaterial == MT.OREMATS.QuartzSand || aMaterial == MT.OREMATS.Pitchblende || aMaterial == MT.Bentonite || aMaterial == MT.Palygorskite || aMaterial == MT.RareEarth || aMaterial == MT.Oilsands) {
493 493
 			if (aPrefix.mNameInternal.startsWith("ore"))                    return aPrefix.mMaterialPre + aMaterial.mNameLocal;
494 494
 			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + aMaterial.mNameLocal;
495 495
 			if (aPrefix == OP.crushed)                                      return "Ground " + aMaterial.mNameLocal;

+ 2
- 2
src/main/java/gregapi/load/LoaderUnificationTargets.java View File

@@ -48,7 +48,7 @@ public class LoaderUnificationTargets implements Runnable {
48 48
 		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Ag                     , ST.make(MD.MF2, "oreSilver", 1, 0));
49 49
 		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.W                      , ST.make(MD.MF2, "oreTungsten", 1, 0));
50 50
 		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.OREMATS.Borax          , ST.make(MD.MF2, "oreBorax", 1, 0));
51
-		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.OREMATS.Kaolinite      , ST.make(MD.MF2, "oreKaolinite", 1, 0));
51
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Kaolinite              , ST.make(MD.MF2, "oreKaolinite", 1, 0));
52 52
 		OreDictManager.INSTANCE.setTarget(OP.blockIngot     , MT.EnderPearl             , ST.make(MD.MF2, "ender_block", 1, 0));
53 53
 		OreDictManager.INSTANCE.setTarget(OP.blockIngot     , MT.Ad                     , ST.make(MD.MF2, "adamantium_block", 1, 0));
54 54
 		OreDictManager.INSTANCE.setTarget(OP.blockIngot     , MT.Mithril                , ST.make(MD.MF2, "mithril_block", 1, 0));
@@ -63,7 +63,7 @@ public class LoaderUnificationTargets implements Runnable {
63 63
 		OreDictManager.INSTANCE.setTarget(OP.blockIngot     , MT.PigIron                , ST.make(MD.MF2, "pigiron_block", 1, 0));
64 64
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.S                      , ST.make(MD.MF2, "MF_Com_sulfur", 1, 0));
65 65
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.Niter                  , ST.make(MD.MF2, "MF_Com_nitre", 1, 0));
66
-		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.OREMATS.Kaolinite      , ST.make(MD.MF2, "MF_Com_kaolinite", 1, 0));
66
+		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.Kaolinite              , ST.make(MD.MF2, "MF_Com_kaolinite", 1, 0));
67 67
 		OreDictManager.INSTANCE.setTarget(OP.dustSmall      , MT.OREMATS.Borax          , ST.make(MD.MF2, "MF_Com_flux_strong", 1, 0));
68 68
 		OreDictManager.INSTANCE.setTarget(OP.dustSmall      , MT.Limestone              , ST.make(MD.MF2, "MF_Com_flux", 1, 0));
69 69
 		OreDictManager.INSTANCE.setTarget(OP.ingot          , MT.Meteorite              , ST.make(MD.FM, "MeteoriteIngot", 1, 0));

+ 2
- 2
src/main/java/gregapi/old/Textures.java View File

@@ -43,7 +43,7 @@ public class Textures {
43 43
 		, ZPM_TOP, ZPM_SIDES, ZPM_BOTTOM
44 44
 		, DUCT_TAPE
45 45
 		
46
-		, MUD, CLAY_BROWN, TURF, CLAY_RED, CLAY_YELLOW, CLAY_BLUE
46
+		, MUD, CLAY_BROWN, TURF, CLAY_RED, CLAY_YELLOW, CLAY_BLUE, CLAY_WHITE
47 47
 		, SAND_MAGNETITE
48 48
 		
49 49
 		, PATH_TOP, PATH_SIDE
@@ -409,7 +409,7 @@ public class Textures {
409 409
 			CLAY_RED,
410 410
 			CLAY_YELLOW,
411 411
 			CLAY_BLUE,
412
-			CLAY_BROWN,
412
+			CLAY_WHITE,
413 413
 			CLAY_BROWN,
414 414
 			CLAY_BROWN,
415 415
 			CLAY_BROWN,

+ 1
- 1
src/main/java/gregapi/worldgen/dungeon/DungeonChunkRoomStorage.java View File

@@ -40,7 +40,7 @@ public class DungeonChunkRoomStorage extends DungeonChunkRoomVault {
40 40
 	public static OreDictMaterial[]
41 41
 	  sHexoriums = {MT.HexoriumRed, MT.HexoriumGreen, MT.HexoriumBlue, MT.HexoriumWhite, MT.HexoriumBlack}
42 42
 	, sInfused   = {MT.InfusedFire, MT.InfusedAir, MT.InfusedWater, MT.InfusedEarth, MT.InfusedEntropy, MT.InfusedOrder}
43
-	, sDusts     = {MT.NaCl, MT.NaCl, MT.KCl, MT.KCl, MT.Gunpowder, MT.Gunpowder, MT.Gunpowder, MT.Bone, MT.Bone, MT.Asphalt, MT.Asphalt, MT.Clay, MT.ClayBrown, MT.ClayRed, MT.Bentonite, MT.Palygorskite, MT.RareEarth, MT.Sugar, MT.Cocoa, MT.Coffee, MT.Vanilla, MT.PepperBlack, MT.Curry, MT.Wheat, MT.Barley, MT.Rye, MT.Rice, MT.Oat, MT.OatAbyssal, MT.Corn, MT.Potato, MT.Blaze, MT.Blizz, MT.Blitz, MT.Basalz}
43
+	, sDusts     = {MT.NaCl, MT.NaCl, MT.KCl, MT.KCl, MT.Gunpowder, MT.Gunpowder, MT.Gunpowder, MT.Bone, MT.Bone, MT.Asphalt, MT.Asphalt, MT.Clay, MT.ClayBrown, MT.ClayRed, MT.Bentonite, MT.Palygorskite, MT.Kaolinite, MT.Porcelain, MT.RareEarth, MT.Sugar, MT.Cocoa, MT.Coffee, MT.Vanilla, MT.PepperBlack, MT.Curry, MT.Wheat, MT.Barley, MT.Rye, MT.Rice, MT.Oat, MT.OatAbyssal, MT.Corn, MT.Potato, MT.Blaze, MT.Blizz, MT.Blitz, MT.Basalz}
44 44
 	, sWoods     = {MT.WOODS.Oak, MT.WOODS.Birch, MT.WOODS.Spruce, MT.WOODS.Jungle, MT.WOODS.Acacia, MT.WOODS.DarkOak, MT.WOODS.Crimson, MT.WOODS.Warped, MT.WOODS.Compressed, MT.WoodRubber, MT.WOODS.Maple, MT.WOODS.Willow, MT.WOODS.BlueMahoe, MT.WOODS.Hazel, MT.WOODS.Cinnamon, MT.WOODS.Coconut, MT.WOODS.Rainbowood, MT.Livingwood, MT.Greatwood, MT.Silverwood, MT.WoodSealed, MT.Weedwood, MT.Skyroot}
45 45
 	, sGems      = {MT.EnderPearl, MT.EnderPearl, MT.EnderEye, MT.Diamond, MT.DiamondPink, MT.Emerald, MT.Aquamarine, MT.Ruby, MT.GreenSapphire, MT.BlueSapphire, MT.Amethyst, MT.Craponite, MT.Amber, MT.WaxBee, MT.WaxRefractory, MT.VoidQuartz, MT.NetherQuartz, MT.NetherQuartz, MT.MilkyQuartz, MT.MilkyQuartz, MT.CertusQuartz, MT.ChargedCertusQuartz, MT.Lapis, MT.Lapis, MT.Lapis, MT.Redstone, MT.Redstone, MT.Redstone, MT.Glowstone, MT.Glowstone, MT.Gloomstone, MT.Apatite, MT.Apatite, MT.Apatite, MT.Coal, MT.Coal, MT.Coal, MT.Coal, MT.Coal, MT.Charcoal, MT.Charcoal, MT.Charcoal, MT.Charcoal, MT.Charcoal, MT.Lignite, MT.Lignite, MT.Lignite, MT.Lignite, MT.Lignite}
46 46
 	, sMetals    = {MT.Cu, MT.Cu, MT.Sn, MT.Bronze, MT.Fe, MT.Fe, MT.Fe, MT.Steel, MT.Steel, MT.StainlessSteel, MT.StainlessSteel, MT.DamascusSteel}

+ 15
- 8
src/main/java/gregtech/blocks/BlockDiggable.java View File

@@ -49,41 +49,47 @@ import net.minecraftforge.common.IPlantable;
49 49
 import net.minecraftforge.common.util.ForgeDirection;
50 50
 
51 51
 public class BlockDiggable extends BlockBaseMeta implements IBlockOnWalkOver {
52
+	public static boolean[] IS_CLAY = {F,T,F,T,T,T,T,F,F,F,F,F,F,F,F,F};
53
+	
52 54
 	public BlockDiggable(String aUnlocalised) {
53
-		super(null, aUnlocalised, Material.ground, soundTypeGravel, 6, Textures.BlockIcons.DIGGABLES);
55
+		super(null, aUnlocalised, Material.ground, soundTypeGravel, 7, Textures.BlockIcons.DIGGABLES);
54 56
 		LH.add(getUnlocalizedName()+ ".0.name", "Mud");
55 57
 		LH.add(getUnlocalizedName()+ ".1.name", "Brown Clay");
56 58
 		LH.add(getUnlocalizedName()+ ".2.name", "Turf");
57 59
 		LH.add(getUnlocalizedName()+ ".3.name", "Red Clay");
58 60
 		LH.add(getUnlocalizedName()+ ".4.name", "Yellow Clay");
59 61
 		LH.add(getUnlocalizedName()+ ".5.name", "Blue Clay");
62
+		LH.add(getUnlocalizedName()+ ".6.name", "White Clay");
60 63
 		
61 64
 		RM.generify(ST.make(this, 1, 1), ST.make(Blocks.clay, 1, 0));
62 65
 		RM.generify(ST.make(this, 1, 3), ST.make(Blocks.clay, 1, 0));
63 66
 		RM.generify(ST.make(this, 1, 4), ST.make(Blocks.clay, 1, 0));
64 67
 		RM.generify(ST.make(this, 1, 5), ST.make(Blocks.clay, 1, 0));
68
+		RM.generify(ST.make(this, 1, 6), ST.make(Blocks.clay, 1, 0));
65 69
 		RM.add_smelting(ST.make(this, 1, 0), ST.make(Blocks.dirt, 1, 1));
66 70
 		RM.add_smelting(ST.make(this, 1, 1), ST.make(Blocks.hardened_clay, 1, 0));
67 71
 		RM.add_smelting(ST.make(this, 1, 3), ST.make(Blocks.hardened_clay, 1, 0));
68 72
 		RM.add_smelting(ST.make(this, 1, 4), ST.make(Blocks.hardened_clay, 1, 0));
69 73
 		RM.add_smelting(ST.make(this, 1, 5), ST.make(Blocks.hardened_clay, 1, 0));
74
+		RM.add_smelting(ST.make(this, 1, 6), ST.make(Blocks.hardened_clay, 1, 0));
70 75
 		OM.data(ST.make(this, 1, 1), MT.ClayBrown, U*4);
71
-		OM.data(ST.make(this, 1, 2), MT.Peat, U);
76
+		OM.data(ST.make(this, 1, 2), MT.Peat, U*4);
72 77
 		OM.data(ST.make(this, 1, 3), MT.ClayRed, U*4);
73 78
 		OM.data(ST.make(this, 1, 4), MT.Bentonite, U*4);
74 79
 		OM.data(ST.make(this, 1, 5), MT.Palygorskite, U*4);
80
+		OM.data(ST.make(this, 1, 6), MT.Kaolinite, U*4);
75 81
 		OM.reg(ST.make(this, 1, 1), OD.blockClay);
76 82
 		OM.reg(ST.make(this, 1, 3), OD.blockClay);
77 83
 		OM.reg(ST.make(this, 1, 4), OD.blockClay);
78 84
 		OM.reg(ST.make(this, 1, 5), OD.blockClay);
85
+		OM.reg(ST.make(this, 1, 6), OD.blockClay);
79 86
 		
80 87
 		BlocksGT.harvestableSpade.add(this);
81 88
 	}
82 89
 	
83 90
 	@Override
84 91
 	public boolean canSustainPlant(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection aSide, IPlantable aPlant) {
85
-		byte aMeta = WD.meta(aWorld, aX, aY, aZ);
86
-		if (aMeta != 0 && aMeta != 2) return F;
92
+		if (IS_CLAY[WD.meta(aWorld, aX, aY, aZ)]) return F;
87 93
 		if (aPlant == Blocks.reeds || aPlant instanceof BlockBush) return T;
88 94
 		EnumPlantType tType = aPlant.getPlantType(aWorld, aX+aSide.offsetX, aY+aSide.offsetY, aZ+aSide.offsetZ);
89 95
 		return tType == EnumPlantType.Plains || tType == EnumPlantType.Water || tType == EnumPlantType.Desert || tType == EnumPlantType.Beach;
@@ -94,10 +100,11 @@ public class BlockDiggable extends BlockBaseMeta implements IBlockOnWalkOver {
94 100
 		switch(aMeta) {
95 101
 		case  0: return new ArrayListNoNulls<>(F, IL.Mud_Ball.get(4));
96 102
 		case  1: return new ArrayListNoNulls<>(F, IL.Clay_Ball_Brown.get(4));
97
-		case  2: return new ArrayListNoNulls<>(F, OP.ingot.mat(MT.Peat, 1));
103
+		case  2: return new ArrayListNoNulls<>(F, OP.ingot.mat(MT.Peat, 4));
98 104
 		case  3: return new ArrayListNoNulls<>(F, IL.Clay_Ball_Red.get(4));
99 105
 		case  4: return new ArrayListNoNulls<>(F, IL.Clay_Ball_Yellow.get(4));
100 106
 		case  5: return new ArrayListNoNulls<>(F, IL.Clay_Ball_Blue.get(4));
107
+		case  6: return new ArrayListNoNulls<>(F, IL.Clay_Ball_White.get(4));
101 108
 		default: return new ArrayListNoNulls<>(F, ST.make(this, 1, aMeta));
102 109
 		}
103 110
 	}
@@ -107,10 +114,10 @@ public class BlockDiggable extends BlockBaseMeta implements IBlockOnWalkOver {
107 114
 		if (doesWalkSpeed(WD.meta(aWorld, aX, aY, aZ))) {aEntity.motionX *= 0.5; aEntity.motionZ *= 0.5;}
108 115
 	}
109 116
 	
110
-	@Override public boolean useGravity      (byte aMeta) {return aMeta == 0 || aMeta == 2;}
111
-	@Override public boolean doesWalkSpeed   (byte aMeta) {return aMeta == 0 || aMeta == 2;}
117
+	@Override public boolean useGravity      (byte aMeta) {return !IS_CLAY[aMeta];}
118
+	@Override public boolean doesWalkSpeed   (byte aMeta) {return !IS_CLAY[aMeta];}
112 119
 	@Override public boolean doesPistonPush  (byte aMeta) {return T;}
113
-	@Override public boolean canCreatureSpawn(byte aMeta) {return aMeta < 6;}
120
+	@Override public boolean canCreatureSpawn(byte aMeta) {return T;}
114 121
 	@Override public boolean isSealable      (byte aMeta, byte aSide) {return F;}
115 122
 	@Override public String getHarvestTool   (int  aMeta) {return TOOL_shovel;}
116 123
 	@Override public int getHarvestLevel     (int  aMeta) {return 0;}

+ 2
- 2
src/main/java/gregtech/compat/Compat_Recipes_Binnie.java View File

@@ -129,7 +129,7 @@ public class Compat_Recipes_Binnie extends CompatMods {
129 129
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Lapis      .get(1), NF, FL.Honey.make(20), OP.gem.mat(MT.Lapis, 9));
130 130
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Sodalite   .get(1), NF, FL.Honey.make(20), OP.gem.mat(MT.Sodalite, 9));
131 131
 			
132
-			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {1250,1250,1250,1250,1250,1250} , IL.BINNIE_Comb_Emerald    .get(1), NF, FL.Honey.make(20), OP.gemChipped.mat(MT.Maxixe, 1), OP.gemChipped.mat(MT.Aquamarine, 1), OP.gemChipped.mat(MT.Morganite, 1), OP.gemChipped.mat(MT.Heliodor, 1), OP.gemChipped.mat(MT.Goshenite, 1), OP.gemChipped.mat(MT.Bixbite, 1));
132
+			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 1250,1250,1250,1250,1250,1250}, IL.BINNIE_Comb_Emerald    .get(1), NF, FL.Honey.make(20), OP.gemChipped.mat(MT.Maxixe, 1), OP.gemChipped.mat(MT.Aquamarine, 1), OP.gemChipped.mat(MT.Morganite, 1), OP.gemChipped.mat(MT.Heliodor, 1), OP.gemChipped.mat(MT.Goshenite, 1), OP.gemChipped.mat(MT.Bixbite, 1));
133 133
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Ruby       .get(1), NF, FL.Honey.make(20), OP.gemChipped.mat(MT.Ruby, 1));
134 134
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 1500, 1500, 1500, 1500, 1500} , IL.BINNIE_Comb_Sapphire   .get(1), NF, FL.Honey.make(20), OP.gemChipped.mat(MT.BlueSapphire, 1), OP.gemChipped.mat(MT.GreenSapphire, 1), OP.gemChipped.mat(MT.YellowSapphire, 1), OP.gemChipped.mat(MT.OrangeSapphire, 1), OP.gemChipped.mat(MT.PurpleSapphire, 1));
135 135
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Olivine    .get(1), NF, FL.Honey.make(20), OP.gemChipped.mat(MT.Olivine, 1));
@@ -139,7 +139,7 @@ public class Compat_Recipes_Binnie extends CompatMods {
139 139
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Blaze      .get(1), NF, FL.Honey.make(20), OM.dust(MT.Blaze, U9*2));
140 140
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Shimmering .get(1), NF, FL.Honey.make(20), OM.dust(MT.EnderPearl, U2));
141 141
 			
142
-			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 3000, 3000, 3000, 3000, 3000} , IL.BINNIE_Comb_Clay       .get(1), NF, FL.Honey.make(20), ST.make(Items.clay_ball, 1, 0), IL.Clay_Ball_Brown.get(1), IL.Clay_Ball_Red.get(1), IL.Clay_Ball_Yellow.get(1), IL.Clay_Ball_Blue.get(1));
142
+			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 2500,2500,2500,2500,2500,2500}, IL.BINNIE_Comb_Clay       .get(1), NF, FL.Honey.make(20), ST.make(Items.clay_ball, 1, 0), IL.Clay_Ball_Brown.get(1), IL.Clay_Ball_Red.get(1), IL.Clay_Ball_Yellow.get(1), IL.Clay_Ball_Blue.get(1), IL.Clay_Ball_White.get(1));
143 143
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Fossil     .get(1), NF, FL.Honey.make(20), OM.dust(MT.Coal, U2));
144 144
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500}                         , IL.BINNIE_Comb_Brimstone  .get(1), NF, MT.H2SO4.liquid(U10,F), OM.dust(MT.S, U*2));
145 145
 			RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] { 7500,  7500}                  , IL.BINNIE_Comb_Unstable   .get(1), NF, MT.HNO3 .liquid(U10,F), OM.dust(MT.KNO3), OM.dust(MT.NaNO3));

+ 2
- 0
src/main/java/gregtech/compat/Compat_Recipes_IndustrialCraft.java View File

@@ -420,10 +420,12 @@ public class Compat_Recipes_IndustrialCraft extends CompatMods {
420 420
 		RM.pulverizing(IL.Clay_Ball_Red   .get(1), OM.dust(MT.ClayRed, U));
421 421
 		RM.pulverizing(IL.Clay_Ball_Yellow.get(1), OM.dust(MT.Bentonite, U));
422 422
 		RM.pulverizing(IL.Clay_Ball_Blue  .get(1), OM.dust(MT.Palygorskite, U));
423
+		RM.pulverizing(IL.Clay_Ball_White .get(1), OM.dust(MT.Kaolinite, U));
423 424
 		RM.pulverizing(ST.make(BlocksGT.Diggables, 1, 1), OM.dust(MT.ClayBrown, U*4));
424 425
 		RM.pulverizing(ST.make(BlocksGT.Diggables, 1, 3), OM.dust(MT.ClayRed, U*4));
425 426
 		RM.pulverizing(ST.make(BlocksGT.Diggables, 1, 4), OM.dust(MT.Bentonite, U*4));
426 427
 		RM.pulverizing(ST.make(BlocksGT.Diggables, 1, 5), OM.dust(MT.Palygorskite, U*4));
428
+		RM.pulverizing(ST.make(BlocksGT.Diggables, 1, 6), OM.dust(MT.Kaolinite, U*4));
427 429
 		
428 430
 		if (IL.IC2_Sapling_Rubber.exists())
429 431
 		RM.ic2_extractor(IL.IC2_Sapling_Rubber.get(1), OM.ingot(MT.Rubber, 2*U9));

+ 1
- 1
src/main/java/gregtech/compat/Compat_Recipes_MagicBees.java View File

@@ -60,7 +60,7 @@ public class Compat_Recipes_MagicBees extends CompatMods {
60 60
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  6000}                     , ST.make(MD.FRMB, "comb", 1,11), NF, NF, OM.dust(MT.WaxMagic), ST.make(Items.feather, 1, 0));
61 61
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  6000}                     , ST.make(MD.FRMB, "comb", 1,12), NF, NF, OM.dust(MT.WaxMagic), OM.dust(MT.Blaze, U9));
62 62
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  6000}                     , ST.make(MD.FRMB, "comb", 1,13), NF, NF, OM.dust(MT.WaxMagic), IL.Dye_SquidInk.get(1));
63
-		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  2000,2000,2000,2000,2000} , ST.make(MD.FRMB, "comb", 1,14), NF, NF, OM.dust(MT.WaxMagic), ST.make(Items.clay_ball, 1, 0), IL.Clay_Ball_Brown.get(1), IL.Clay_Ball_Red.get(1), IL.Clay_Ball_Yellow.get(1), IL.Clay_Ball_Blue.get(1));
63
+		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  2000,2000,2000,2000,2000} , ST.make(MD.FRMB, "comb", 1,14), NF, NF, OM.dust(MT.WaxMagic), IL.Clay_Ball_Brown.get(1), IL.Clay_Ball_Red.get(1), IL.Clay_Ball_Yellow.get(1), IL.Clay_Ball_Blue.get(1), IL.Clay_Ball_White.get(1));
64 64
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  8000,  6000}              , ST.make(MD.FRMB, "comb", 1,15), NF, NF, OM.dust(MT.WaxMagic), IL.FRMB_Propolis_Breezey.get(1), ST.make(Items.feather, 1, 0));
65 65
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  8000,  6000}              , ST.make(MD.FRMB, "comb", 1,16), NF, NF, OM.dust(MT.WaxMagic), IL.FRMB_Propolis_Burning.get(1), OM.dust(MT.Blaze, U9));
66 66
 		RM.Centrifuge   .addRecipe1(T, 16,   64, new long[] {10000,  8000,  6000}              , ST.make(MD.FRMB, "comb", 1,17), NF, NF, OM.dust(MT.WaxMagic), IL.FRMB_Propolis_Flowing.get(1), IL.Dye_SquidInk.get(1));

+ 3
- 2
src/main/java/gregtech/items/MultiItemBumbles.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -42,6 +42,7 @@ import gregapi.util.OM;
42 42
 import gregapi.util.ST;
43 43
 import gregapi.util.UT;
44 44
 import gregapi.util.WD;
45
+import gregtech.blocks.BlockDiggable;
45 46
 import gregtech.tileentity.plants.MultiTileEntityResinHoleRubber;
46 47
 import net.minecraft.block.Block;
47 48
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -319,7 +320,7 @@ public class MultiItemBumbles extends MultiItemRandom implements IItemBumbleBee
319 320
 		case 100:
320 321
 			for (int j : tOrderY) for (int i : tOrderX) for (int k : tOrderZ) {
321 322
 				Block tBlock = WD.block(aWorld, aX+i, aY+j, aZ+k, F);
322
-				if (tBlock == Blocks.clay || (tBlock == BlocksGT.Diggables && WD.meta(aWorld, aX+i, aY+j, aZ+k) % 2 == 1)) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
323
+				if (tBlock == Blocks.clay || (tBlock == BlocksGT.Diggables && BlockDiggable.IS_CLAY[WD.meta(aWorld, aX+i, aY+j, aZ+k)])) return new ChunkCoordinates(aX+i, aY+j, aZ+k);
323 324
 			}
324 325
 			return null;
325 326
 		case 101:

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

@@ -137,64 +137,76 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
137 137
 		IL.Clay_Ball_Red   .set(addItem(tLastID = 12311, "Red Clay"         , "Perfectly Balanced With No Exploits!"   , OD.itemClay, TC.stack(TC.TERRA, 1), new OreDictItemData(MT.ClayRed, U)));
138 138
 		IL.Clay_Ball_Yellow.set(addItem(tLastID = 12312, "Yellow Clay"      , "Bentonite Clay"                         , OD.itemClay, TC.stack(TC.TERRA, 1), new OreDictItemData(MT.Bentonite, U)));
139 139
 		IL.Clay_Ball_Blue  .set(addItem(tLastID = 12313, "Blue Clay"        , "Palygorskite Clay / Fullers Earth"      , OD.itemClay, TC.stack(TC.TERRA, 1), new OreDictItemData(MT.Palygorskite, U)));
140
+		IL.Clay_Ball_White .set(addItem(tLastID = 12314, "White Clay"       , "Kaolinite Clay / Porcelain Clay"        , OD.itemClay, TC.stack(TC.TERRA, 1), new OreDictItemData(MT.Kaolinite, U)));
140 141
 		CR.remove(ST.make(Items.clay_ball, 1, 0), ST.make(Items.clay_ball, 1, 0), NI, ST.make(Items.clay_ball, 1, 0), ST.make(Items.clay_ball, 1, 0));
141 142
 		RM.generify(IL.Clay_Ball_Brown .get(1), ST.make(Items.clay_ball, 1, 0));
142 143
 		RM.generify(IL.Clay_Ball_Red   .get(1), ST.make(Items.clay_ball, 1, 0));
143 144
 		RM.generify(IL.Clay_Ball_Yellow.get(1), ST.make(Items.clay_ball, 1, 0));
144 145
 		RM.generify(IL.Clay_Ball_Blue  .get(1), ST.make(Items.clay_ball, 1, 0));
146
+		RM.generify(IL.Clay_Ball_White .get(1), ST.make(Items.clay_ball, 1, 0));
145 147
 		RM.add_smelting(IL.Clay_Ball_Brown .get(1), ST.make(Items.brick, 1, 0));
146 148
 		RM.add_smelting(IL.Clay_Ball_Red   .get(1), ST.make(Items.brick, 1, 0));
147 149
 		RM.add_smelting(IL.Clay_Ball_Yellow.get(1), ST.make(Items.brick, 1, 0));
148 150
 		RM.add_smelting(IL.Clay_Ball_Blue  .get(1), ST.make(Items.brick, 1, 0));
151
+		RM.add_smelting(IL.Clay_Ball_White .get(1), ST.make(Items.brick, 1, 0));
149 152
 		CR.shaped   (OP.plate.mat(MT.Clay         , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', Items.clay_ball);
150 153
 		CR.shaped   (OP.plate.mat(MT.ClayBrown    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Brown);
151 154
 		CR.shaped   (OP.plate.mat(MT.ClayRed      , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Red);
152 155
 		CR.shaped   (OP.plate.mat(MT.Bentonite    , 1), CR.DEF_NAC_NCC, "R", "C", 'R', OreDictToolNames.rollingpin, 'C', IL.Clay_Ball_Yellow);
153 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);
154 158
 		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Mud_Ball);
155 159
 		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 1), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Brown);
156 160
 		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 3), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Red);
157 161
 		CR.shaped   (ST.make(BlocksGT.Diggables, 1, 4), CR.DEF_NAC_NCC, "XX", "XX", 'X', IL.Clay_Ball_Yellow);
158 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);
159 164
 		CR.shaped   (ST.make(Blocks.clay       , 1, 0), CR.DEF_NAC_NCC, "XX", "XX", 'X', Items.clay_ball);
160 165
 		CR.shapeless(IL.Mud_Ball               .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 0)});
161 166
 		CR.shapeless(IL.Clay_Ball_Brown        .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 1)});
162 167
 		CR.shapeless(IL.Clay_Ball_Red          .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 3)});
163 168
 		CR.shapeless(IL.Clay_Ball_Yellow       .get(4), CR.DEF_NAC_NCC, new Object[] {ST.make(BlocksGT.Diggables, 1, 4)});
164 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)});
165 171
 		CR.shapeless(ST.make(Items.clay_ball   , 4, 0), CR.DEF_NAC_NCC, new Object[] {Blocks.clay});
166 172
 		RM.packunpack(IL.Mud_Ball              .get(4), ST.make(BlocksGT.Diggables, 1, 0));
167 173
 		RM.packunpack(IL.Clay_Ball_Brown       .get(4), ST.make(BlocksGT.Diggables, 1, 1));
168 174
 		RM.packunpack(IL.Clay_Ball_Red         .get(4), ST.make(BlocksGT.Diggables, 1, 3));
169 175
 		RM.packunpack(IL.Clay_Ball_Yellow      .get(4), ST.make(BlocksGT.Diggables, 1, 4));
170 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));
171 178
 		RM.packunpack(ST.make(Items.clay_ball  , 4, 0), ST.make(Blocks.clay       , 1, 0));
172 179
 		RM.RollBender.addRecipe1(T, 16, 32, ST.make(Items.clay_ball   , 1, 0), OP.plate.mat(MT.Clay        , 1));
173 180
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Brown        .get(1), OP.plate.mat(MT.ClayBrown   , 1));
174 181
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Red          .get(1), OP.plate.mat(MT.ClayRed     , 1));
175 182
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Yellow       .get(1), OP.plate.mat(MT.Bentonite   , 1));
176 183
 		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_Blue         .get(1), OP.plate.mat(MT.Palygorskite, 1));
184
+		RM.RollBender.addRecipe1(T, 16, 32, IL.Clay_Ball_White        .get(1), OP.plate.mat(MT.Kaolinite   , 1));
177 185
 		RM.Compressor.addRecipe1(T, 16, 32, IL.Mud_Ball               .get(4), ST.make(BlocksGT.Diggables, 1, 0));
178 186
 		RM.Compressor.addRecipe1(T, 16, 32, ST.make(Items.clay_ball   , 4, 0), ST.make(Blocks.clay       , 1, 0));
179 187
 		RM.Compressor.addRecipe1(T, 16, 32, IL.Clay_Ball_Brown        .get(4), ST.make(BlocksGT.Diggables, 1, 1));
180 188
 		RM.Compressor.addRecipe1(T, 16, 32, IL.Clay_Ball_Red          .get(4), ST.make(BlocksGT.Diggables, 1, 3));
181 189
 		RM.Compressor.addRecipe1(T, 16, 32, IL.Clay_Ball_Yellow       .get(4), ST.make(BlocksGT.Diggables, 1, 4));
182 190
 		RM.Compressor.addRecipe1(T, 16, 32, IL.Clay_Ball_Blue         .get(4), ST.make(BlocksGT.Diggables, 1, 5));
191
+		RM.Compressor.addRecipe1(T, 16, 32, IL.Clay_Ball_White        .get(4), ST.make(BlocksGT.Diggables, 1, 6));
183 192
 		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.Clay           , 4* U), ST.make(Blocks.clay       , 1, 0));
184 193
 		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.ClayBrown      , 4* U), ST.make(BlocksGT.Diggables, 1, 1));
185 194
 		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.ClayRed        , 4* U), ST.make(BlocksGT.Diggables, 1, 3));
186 195
 		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.Bentonite      , 4* U), ST.make(BlocksGT.Diggables, 1, 4));
187 196
 		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.Palygorskite   , 4* U), ST.make(BlocksGT.Diggables, 1, 5));
197
+		RM.Compressor.addRecipe1(T, 16, 32, OM.dust(MT.Kaolinite      , 4* U), ST.make(BlocksGT.Diggables, 1, 6));
188 198
 		RM.Mortar    .addRecipe1(T, 16, 16, ST.make(Items.clay_ball   , 1, W), OM.dust(MT.Clay));
189 199
 		RM.Mortar    .addRecipe1(T, 16, 16, IL.Clay_Ball_Brown        .get(1), OM.dust(MT.ClayBrown));
190 200
 		RM.Mortar    .addRecipe1(T, 16, 16, IL.Clay_Ball_Red          .get(1), OM.dust(MT.ClayRed));
191 201
 		RM.Mortar    .addRecipe1(T, 16, 16, IL.Clay_Ball_Yellow       .get(1), OM.dust(MT.Bentonite));
192 202
 		RM.Mortar    .addRecipe1(T, 16, 16, IL.Clay_Ball_Blue         .get(1), OM.dust(MT.Palygorskite));
203
+		RM.Mortar    .addRecipe1(T, 16, 16, IL.Clay_Ball_White        .get(1), OM.dust(MT.Kaolinite));
193 204
 		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(Blocks.clay       , 1, W), OM.dust(MT.Clay, U*4));
194 205
 		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(BlocksGT.Diggables, 1, 1), OM.dust(MT.ClayBrown, U*4));
195 206
 		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(BlocksGT.Diggables, 1, 3), OM.dust(MT.ClayRed, U*4));
196 207
 		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(BlocksGT.Diggables, 1, 4), OM.dust(MT.Bentonite, U*4));
197 208
 		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(BlocksGT.Diggables, 1, 5), OM.dust(MT.Palygorskite, U*4));
209
+		RM.Mortar    .addRecipe1(T, 16, 64, ST.make(BlocksGT.Diggables, 1, 6), OM.dust(MT.Kaolinite, U*4));
198 210
 		for (FluidStack tWater : FL.array(FL.Water.make(125), FL.SpDew.make(125), FL.DistW.make(100))) {
199 211
 		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.Ceramic      ), FL.mul(tWater, 5), NF, ST.make(Items.clay_ball, 1, 0));
200 212
 		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.Clay         ),        tWater    , NF, ST.make(Items.clay_ball, 1, 0));
@@ -202,6 +214,7 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
202 214
 		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.ClayBrown    ),        tWater    , NF, IL.Clay_Ball_Brown.get(1));
203 215
 		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.Bentonite    ),        tWater    , NF, IL.Clay_Ball_Yellow.get(1));
204 216
 		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.Palygorskite ),        tWater    , NF, IL.Clay_Ball_Blue.get(1));
217
+		RM.Bath      .addRecipe1(T,  0, 16, OM.dust(MT.Kaolinite    ),        tWater    , NF, IL.Clay_Ball_White.get(1));
205 218
 		}
206 219
 		
207 220
 		IL.Comb_Honey   .set(addItem(tLastID = 30000, "Honey Comb"   , "", OD.beeComb, OD.materialHoneycomb, "foodFilledhoneycomb", TC.stack(TC.LIMUS, 1), TC.stack(TC.FAMES, 1), TC.stack(TC.SANO, 1)));
@@ -229,26 +242,26 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
229 242
 		
230 243
 		
231 244
 																																										  
232
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Honey   .get(1), NF   , FL.Honey                                .make( 100), OM.dust(MT.WaxBee)                , IL.FR_Propolis.get(1));
233
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Water   .get(1), NF   , FL.Water                                .make(1000), OM.dust(MT.WaxBee)                );
234
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Magic   .get(1), NF   , FL.Ambrosia                             .make( 100), OM.dust(MT.WaxMagic)              );
235
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Nether  .get(1), NF   , FL.Blaze                                .make(   L), OM.dust(MT.WaxRefractory)         );
236
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000,  1000}       , IL.Comb_End     .get(1), NF   , FL.Dragon_Breath                        .make( 125), OM.dust(MT.Endstone)              , IL.FR_Propolis_Pulsating.get(1), IL.EtFu_Chorus_Fruit.get(1));
237
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Rock    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Stone)                 );
238
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Jungle  .get(1), NF   , MT.Chocolate                          .liquid(U, T), OM.dust(MT.Cocoa)                 , IL.FR_Propolis_Silky.get(1, ST.make(Items.string, 1, 0)));
239
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Frozen  .get(1), NF   , FL.Ice                                  .make(1000), OM.dust(MT.Ice)                   );
240
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] { 6000,  6000}              , IL.Comb_Shroom  .get(1), NF   , FL.Soup_Mushroom                        .make(1000), ST.make(Blocks.red_mushroom_block, 1, 0), ST.make(Blocks.brown_mushroom_block, 1, 0));
241
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Sandy   .get(1), NF   , FL.Juice_Cactus                         .make( 100), ST.make(Blocks.sand, 1, 0)        );
242
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] { 2400, 2400,2400,2400,2400}, IL.Comb_Clay    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Clay)                  , OM.dust(MT.ClayBrown), OM.dust(MT.ClayRed), OM.dust(MT.Bentonite), OM.dust(MT.Palygorskite));
243
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  3000}              , IL.Comb_Sticky  .get(1), NF   , FL.Latex                                .make(   L), OM.dust(MT.WaxBee)                , IL.FR_Propolis_Sticky.get(1, IL.IC2_Resin.get(1, IL.Resin.get(1))));
244
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000}                     , IL.Comb_Royal   .get(1), ZL_FS, FL.array(FL.Honey.make(50), FL.RoyalJelly.make(10)), OM.dust(MT.WaxBee)                );
245
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Soul    .get(1), NF   , FL.Oil_Soulsand                         .make(  50), OM.dust(MT.WaxSoulful)            , OM.dust(MT.SoulSand));
246
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Amnesic .get(1), NF   , FL                                      .lube(1000), OM.dust(MT.WaxAmnesic)            );
247
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,   500,   500,   250}, IL.Comb_Military.get(1), NF   , FL.Potion_Harm_1                        .make(  50), OM.dust(MT.Bone)                  , ST.make(Items.bone, 1, 0), ST.make(Items.rotten_flesh, 1, 0), ST.make(Items.spider_eye, 1, 0));
248
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Pyro    .get(1), NF   , FL.Blaze                                .make( L/2), OM.dust(MT.Blaze, U9)             , OP.stick.mat(MT.Blaze, 1));
249
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Cryo    .get(1), NF   , FL.Ice                                  .make( 500), OM.dust(MT.Blizz, U9)             , OP.stick.mat(MT.Blizz, 1));
250
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Aero    .get(1), NF   , FL.Dragon_Breath                        .make(  50), OM.dust(MT.Blitz, U9)             , OP.stick.mat(MT.Blitz, 1));
251
-		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Tera    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Basalz, U9)            , OP.stick.mat(MT.Basalz, 1));
245
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Honey   .get(1), NF   , FL.Honey                                .make( 100), OM.dust(MT.WaxBee)                , IL.FR_Propolis.get(1));
246
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Water   .get(1), NF   , FL.Water                                .make(1000), OM.dust(MT.WaxBee)                );
247
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Magic   .get(1), NF   , FL.Ambrosia                             .make( 100), OM.dust(MT.WaxMagic)              );
248
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Nether  .get(1), NF   , FL.Blaze                                .make(   L), OM.dust(MT.WaxRefractory)         );
249
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000,  1000}           , IL.Comb_End     .get(1), NF   , FL.Dragon_Breath                        .make( 125), OM.dust(MT.Endstone)              , IL.FR_Propolis_Pulsating.get(1), IL.EtFu_Chorus_Fruit.get(1));
250
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Rock    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Stone)                 );
251
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Jungle  .get(1), NF   , MT.Chocolate                          .liquid(U, T), OM.dust(MT.Cocoa)                 , IL.FR_Propolis_Silky.get(1, ST.make(Items.string, 1, 0)));
252
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Frozen  .get(1), NF   , FL.Ice                                  .make(1000), OM.dust(MT.Ice)                   );
253
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] { 6000,  6000}                  , IL.Comb_Shroom  .get(1), NF   , FL.Soup_Mushroom                        .make(1000), ST.make(Blocks.red_mushroom_block, 1, 0), ST.make(Blocks.brown_mushroom_block, 1, 0));
254
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Sandy   .get(1), NF   , FL.Juice_Cactus                         .make( 100), ST.make(Blocks.sand, 1, 0)        );
255
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] { 2000,2000,2000,2000,2000,2000}, IL.Comb_Clay    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Clay)                  , OM.dust(MT.ClayBrown), OM.dust(MT.ClayRed), OM.dust(MT.Bentonite), OM.dust(MT.Palygorskite), OM.dust(MT.Kaolinite));
256
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  3000}                  , IL.Comb_Sticky  .get(1), NF   , FL.Latex                                .make(   L), OM.dust(MT.WaxBee)                , IL.FR_Propolis_Sticky.get(1, IL.IC2_Resin.get(1, IL.Resin.get(1))));
257
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000}                         , IL.Comb_Royal   .get(1), ZL_FS, FL.array(FL.Honey.make(50), FL.RoyalJelly.make(10)), OM.dust(MT.WaxBee)                );
258
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Soul    .get(1), NF   , FL.Oil_Soulsand                         .make(  50), OM.dust(MT.WaxSoulful)            , OM.dust(MT.SoulSand));
259
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Amnesic .get(1), NF   , FL                                      .lube(1000), OM.dust(MT.WaxAmnesic)            );
260
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,   500,   500,   250}    , IL.Comb_Military.get(1), NF   , FL.Potion_Harm_1                        .make(  50), OM.dust(MT.Bone)                  , ST.make(Items.bone, 1, 0), ST.make(Items.rotten_flesh, 1, 0), ST.make(Items.spider_eye, 1, 0));
261
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Pyro    .get(1), NF   , FL.Blaze                                .make( L/2), OM.dust(MT.Blaze, U9)             , OP.stick.mat(MT.Blaze, 1));
262
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Cryo    .get(1), NF   , FL.Ice                                  .make( 500), OM.dust(MT.Blizz, U9)             , OP.stick.mat(MT.Blizz, 1));
263
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Aero    .get(1), NF   , FL.Dragon_Breath                        .make(  50), OM.dust(MT.Blitz, U9)             , OP.stick.mat(MT.Blitz, 1));
264
+		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}                  , IL.Comb_Tera    .get(1), NF   , FL.Concrete                             .make(   L), OM.dust(MT.Basalz, U9)            , OP.stick.mat(MT.Basalz, 1));
252 265
 		
253 266
 		
254 267
 		IL.Food_Lemon                          .set(addItem(tLastID =     0, "Lemon"                                    , "Don't make Lemonade"         , "cropLemon"                   , new FoodStat( 1, 0.600F,   0, C+36,  0.30F,   0,   0,   0,   4,   0, EnumAction.eat, null                                 , F, T, F, T), TC.stack(TC.MESSIS, 1), TC.stack(TC.HERBA, 1), TC.stack(TC.FAMES, 1)));

+ 10
- 9
src/main/java/gregtech/items/MultiItemRandomTools.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -79,7 +79,9 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
79 79
 		RM.add_smelting(IL.Compound_Brass        .get(1), OP.nugget.mat(MT.Brass        , 1));
80 80
 		RM.add_smelting(IL.Compound_BismuthBronze.get(1), OP.nugget.mat(MT.BismuthBronze, 1));
81 81
 		
82
+		IL.Porcelain_Cup_Raw               .set(addItem(899, "Modeled Porcelain Cup"    , "Put in Furnace to harden", new OreDictItemData(MT.Porcelain, U), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS, 1))); CR.shapeless(OP.dust.mat(MT.Porcelain, 1), CR.DEF_NCC, new Object[] {last()});
82 83
 		
84
+		CR.shaped(IL.Porcelain_Cup_Raw   .get(1), CR.DEF_NCC    , "kPR"              , 'P', OP.dust.dat(MT.Porcelain), 'R', OreDictToolNames.rollingpin);
83 85
 		
84 86
 		IL.Ceramic_Ingot_Mold_Raw          .set(addItem(900, "Clay Ingot Mold"          , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
85 87
 		IL.Ceramic_Chunk_Mold_Raw          .set(addItem(901, "Clay Chunk Mold"          , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*5), TC.stack(TC.TERRA, 2), TC.stack(TC.GELUM     , 1))); CR.shapeless(ST.make(Items.clay_ball, 5, 0), CR.DEF_NCC, new Object[] {last()});
@@ -122,12 +124,6 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
122 124
 		IL.Ceramic_Jug_Raw                 .set(addItem(996, "Clay Jug"                 , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*6), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS    , 1))); CR.shapeless(ST.make(Items.clay_ball, 6, 0), CR.DEF_NCC, new Object[] {last()});
123 125
 		IL.Measuring_Pot_Raw               .set(addItem(997, "Clay Measuring Pot"       , "Put in Furnace to harden", new OreDictItemData(MT.Clay, U*4), TC.stack(TC.TERRA, 2), TC.stack(TC.VACUOS    , 1))); CR.shapeless(ST.make(Items.clay_ball, 4, 0), CR.DEF_NCC, new Object[] {last()});
124 126
 		
125
-		IL.Food_Can_Empty                  .set(addItem(998, "Empty Food Can"           , "Used for canning Food"   , new OreDictItemData(MT.TinAlloy, OP.plateCurved.mAmount), TC.stack(TC.VACUOS, 1), TC.stack(TC.FABRICO, 1)));
126
-		IL.Spray_Empty                     .set(addItem(999, "Empty Spray Can"          , "Used for making Sprays"  , new OreDictItemData(MT.Sn, OP.plateCurved.mAmount, MT.Redstone, OP.dust.mAmount), TC.stack(TC.VACUOS, 1), TC.stack(TC.MOTUS, 1)));
127
-		
128
-		RM.RollBender.addRecipe1(T, 16, 64, OP.plateCurved.mat(MT.TinAlloy, 1), IL.Food_Can_Empty.get(1));
129
-// TODO RA.addAssemblerRecipe(OP.dust.mat(MT.Redstone, 1), OP.cell.mat(MT.Empty, 1), IL.Spray_Empty.get(1), 800, 1);
130
-		
131 127
 		CR.shaped(IL.Ceramic_Tap_Raw     .get(1), CR.DEF_NCC    , "CCR", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
132 128
 		CR.shaped(IL.Ceramic_Funnel_Raw  .get(1), CR.DEF_NCC    , "CRC", "kC "       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
133 129
 		CR.shaped(IL.Ceramic_Crucible_Raw.get(1), CR.DEF_NCC    , "CkC", "CRC", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
@@ -139,8 +135,6 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
139 135
 		CR.shaped(IL.Ceramic_Bowl_Raw    .get(1), CR.DEF_NCC    , "k R", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
140 136
 		CR.shaped(IL.Ceramic_Jug_Raw     .get(1), CR.DEF_NCC    , "kCR", "C C", "CCC", 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
141 137
 		CR.shaped(IL.Measuring_Pot_Raw   .get(1), CR.DEF_NCC    , "CkC", "CCR"       , 'C', OD.itemClay, 'R', OreDictToolNames.rollingpin);
142
-		CR.shaped(IL.Food_Can_Empty      .get(1), CR.DEF_NAC_NCC, "fh" , "oP"        , 'P', OP.plateCurved.dat(MT.TinAlloy));
143
-		CR.shaped(IL.Spray_Empty         .get(1), CR.DEF_NCC    , "Rf" , "Cs"        , 'R', OD.itemRedstone, 'C', OP.plateCurved.dat(MT.Sn));
144 138
 		
145 139
 		CR.shapeless(IL.Ceramic_Ingot_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.ingot.dat(MT.TECH.Brick)});
146 140
 		CR.shapeless(IL.Ceramic_Plate_Mold_Raw          .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OD.paneGlass});
@@ -222,6 +216,13 @@ public class MultiItemRandomTools extends MultiItemRandom implements IItemRottab
222 216
 		CR.shapeless(IL.Ceramic_Builderwand_Mold_Raw    .get(1), CR.DEF_NCC, new Object[] {IL.Ceramic_Mold_Raw, OP.toolHeadBuilderwand.dat(tMat)});
223 217
 		}
224 218
 		
219
+		IL.Food_Can_Empty.set(addItem(998, "Empty Food Can" , "Used for canning Food" , new OreDictItemData(MT.TinAlloy, OP.plateCurved.mAmount), TC.stack(TC.VACUOS, 1), TC.stack(TC.FABRICO, 1)));
220
+		IL.Spray_Empty   .set(addItem(999, "Empty Spray Can", "Used for making Sprays", new OreDictItemData(MT.Sn, OP.plateCurved.mAmount, MT.Redstone, OP.dust.mAmount), TC.stack(TC.VACUOS, 1), TC.stack(TC.MOTUS, 1)));
221
+		
222
+		RM.RollBender.addRecipe1(T, 16, 64, OP.plateCurved.mat(MT.TinAlloy, 1), IL.Food_Can_Empty.get(1));
223
+// TODO RA.addAssemblerRecipe(OP.dust.mat(MT.Redstone, 1), OP.cell.mat(MT.Empty, 1), IL.Spray_Empty.get(1), 800, 1);
224
+		CR.shaped(IL.Food_Can_Empty      .get(1), CR.DEF_NAC_NCC, "fh" , "oP"        , 'P', OP.plateCurved.dat(MT.TinAlloy));
225
+		CR.shaped(IL.Spray_Empty         .get(1), CR.DEF_NCC    , "Rf" , "Cs"        , 'R', OD.itemRedstone, 'C', OP.plateCurved.dat(MT.Sn));
225 226
 		
226 227
 		for (byte i = 0; i < 16; i++) {
227 228
 		IL.SPRAY_CAN_DYES[i]               .set(addItem( 1000+2*i, "Spray Paint ("+DYE_NAMES[i]+")", "Full", TC.stack(TC.SENSUS, 4)));

+ 3
- 3
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -2032,9 +2032,9 @@ public class Loader_MultiTileEntities implements Runnable {
2032 2032
 		aMat = MT.Yellow;           aRegistry.add("Grass Rope"                                          , "Ropes"                               , 32013, 32011, MultiTileEntityRope.class                               ,                 0, 64, aUtilWool      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   1.0F, NBT_FLAMMABILITY,100), " GG", "GGG", "GGq", 'G', OD.itemGrassDry);             IL.Rope_Grass.set(aRegistry.getItem());
2033 2033
 		aMat = MT.Plastic;          aRegistry.add("Plastic Rope"                                        , "Ropes"                               , 32014, 32011, MultiTileEntityRope.class                               ,                 0, 64, aUtilWool      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   1.0F                      ),  " P",  "PP",  "Pq", 'P', OP.wireFine.dat(MT.Plastic)); IL.Rope_Plastic.set(aRegistry.getItem());
2034 2034
 		
2035
-		aMat = MT.Porcelain;        aRegistry.add("Porcelain Cup"                                       , "Fluid Containers"                    , 32739, 32719, MultiTileEntityCup.class                                ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,  250, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Porcelain_Cup.set(aRegistry.getItem(), new OreDictItemData(MT.Porcelain, U*1));
2036
-		aMat = MT.Ceramic;          aRegistry.add("Ceramic Jug"                                         , "Fluid Containers"                    , 32740, 32719, MultiTileEntityJug.class                                ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY, 2000, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Ceramic_Jug  .set(aRegistry.getItem(), new OreDictItemData(MT.Ceramic, U*6)); RM.add_smelting(IL.Ceramic_Jug_Raw.get(1), IL.Ceramic_Jug.get(1));
2037
-		aMat = MT.Ceramic;          aRegistry.add("Ceramic Measuring Pot"                               , "Fluid Containers"                    , 32738, 32719, MultiTileEntityMeasuringPot.class                       ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY, 1000, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Measuring_Pot.set(aRegistry.getItem(), new OreDictItemData(MT.Ceramic, U*4)); RM.add_smelting(IL.Measuring_Pot_Raw.get(1), IL.Measuring_Pot.get(1));
2035
+		aMat = MT.Porcelain;        aRegistry.add("Porcelain Cup"                                       , "Fluid Containers"                    , 32739, 32719, MultiTileEntityCup.class                                ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,  250, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Porcelain_Cup.set(aRegistry.getItem(), new OreDictItemData(MT.Porcelain, U*1)); RM.add_smelting(IL.Porcelain_Cup_Raw.get(1), IL.Porcelain_Cup.get(1));
2036
+		aMat = MT.Ceramic;          aRegistry.add("Ceramic Jug"                                         , "Fluid Containers"                    , 32740, 32719, MultiTileEntityJug.class                                ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY, 2000, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Ceramic_Jug  .set(aRegistry.getItem(), new OreDictItemData(MT.Ceramic  , U*6)); RM.add_smelting(IL.Ceramic_Jug_Raw  .get(1), IL.Ceramic_Jug  .get(1));
2037
+		aMat = MT.Ceramic;          aRegistry.add("Ceramic Measuring Pot"                               , "Fluid Containers"                    , 32738, 32719, MultiTileEntityMeasuringPot.class                       ,                 0, 16, aUtilStone     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY, 1000, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint)); IL.Measuring_Pot.set(aRegistry.getItem(), new OreDictItemData(MT.Ceramic  , U*4)); RM.add_smelting(IL.Measuring_Pot_Raw.get(1), IL.Measuring_Pot.get(1));
2038 2038
 		aMat = MT.StainlessSteel;   aRegistry.add("Stainless Measuring Pot"                             , "Fluid Containers"                    , 32743, 32719, MultiTileEntityMeasuringPot.class                       ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY, 1000, NBT_ACIDPROOF, T, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint-50), "Ch", "Pf", 'P', OP.plate.dat(aMat), 'C', OP.plateCurved.dat(aMat));
2039 2039
 		aMat = ANY.W;               aRegistry.add("Tungsten Measuring Pot"                              , "Fluid Containers"                    , 32744, 32719, MultiTileEntityMeasuringPot.class                       ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY, 1000, NBT_ACIDPROOF, T, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint-50), "Ch", "Pf", 'P', OP.plate.dat(aMat), 'C', OP.plateCurved.dat(aMat));
2040 2040
 		aMat = MT.Ta4HfC5;          aRegistry.add("Tantalum Hafnium Carbide Measuring Pot"              , "Fluid Containers"                    , 32077, 32719, MultiTileEntityMeasuringPot.class                       ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   0.5F, NBT_RESISTANCE,  10.0F, NBT_TANK_CAPACITY, 1000, NBT_ACIDPROOF, F, NBT_LIQUIDPROOF, T, NBT_GASPROOF, F, NBT_TEMPERATURE, aMat.mMeltingPoint-50), "Ch", "Pf", 'P', OP.plate.dat(aMat), 'C', OP.plateCurved.dat(aMat));

+ 8
- 7
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -435,7 +435,7 @@ public class Loader_Worldgen implements Runnable {
435 435
 		, new StoneLayerOres(MT.OREMATS.Diatomite       , U16, 16, 64)
436 436
 		);
437 437
 		StoneLayer.bothsides(MT.Limestone, MT.Quartzite
438
-		, new StoneLayerOres(MT.OREMATS.Kaolinite       , U3 , 32, 72)
438
+		, new StoneLayerOres(MT.OREMATS.Kyanite       , U3 , 32, 72)
439 439
 		);
440 440
 		StoneLayer.bothsides(MT.Marble, MT.Quartzite
441 441
 		, new StoneLayerOres(MT.Asbestos                , U4 ,  0, 48)
@@ -528,11 +528,12 @@ public class Loader_Worldgen implements Runnable {
528 528
 		new WorldgenBlackSand       ("river.magnetite"         , T, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS);
529 529
 		new WorldgenTurf            ("swamp.turf"              , T, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT);
530 530
 		
531
-		new WorldgenPit             ("pit.clay.vanilla"        , T, Blocks.clay       , 0, 1, 256, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
532
-		new WorldgenPit             ("pit.clay.brown"          , T, BlocksGT.Diggables, 1, 1, 256, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
533
-		new WorldgenPit             ("pit.clay.red"            , F, BlocksGT.Diggables, 3, 1, 256, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM); // Disabled by default because its supposed to be only in the Nether
534
-		new WorldgenPit             ("pit.clay.yellow"         , T, BlocksGT.Diggables, 4, 1, 256, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
535
-		new WorldgenPit             ("pit.clay.blue"           , T, BlocksGT.Diggables, 5, 1, 256, GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_TFC, GEN_TWILIGHT, GEN_TROPICS, GEN_ALFHEIM);
531
+		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);
532
+		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);
533
+		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
534
+		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);
535
+		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);
536
+		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);
536 537
 		
537 538
 		new WorldgenNetherClay      ("nether.clay.red"         , T, GEN_NETHER);
538 539
 		new WorldgenNetherQuartz    ("nether.netherquartz"     , T, GEN_NETHER);
@@ -864,7 +865,7 @@ public class Loader_Worldgen implements Runnable {
864 865
 		new WorldgenOresLarge("ore.large.diamond"     , T, T,  5,  20,  40, 2, 16, MT.Graphite                     , MT.Graphite                    , MT.Diamond                     , MT.Graphite                    , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS);
865 866
 		new WorldgenOresLarge("ore.large.galena"      , T, T, 30,  60,  40, 5, 16, MT.OREMATS.Galena               , MT.OREMATS.Galena              , MT.Ag                          , MT.Pb                          , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS);
866 867
 		new WorldgenOresLarge("ore.large.quartz"      , T, T, 40,  80,  60, 3, 16, MT.MilkyQuartz                  , MT.OREMATS.Barite              , MT.CertusQuartz                , MT.CertusQuartz                , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_MOON, ORE_ASTEROIDS);
867
-		new WorldgenOresLarge("ore.large.olivine"     , T, T, 10,  40,  60, 3, 16, MT.OREMATS.Kaolinite            , MT.MgCO3                       , MT.Olivine                     , MT.OREMATS.Glauconite          , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_MOON);
868
+		new WorldgenOresLarge("ore.large.olivine"     , T, T, 10,  40,  60, 3, 16, MT.OREMATS.Kyanite              , MT.MgCO3                       , MT.Olivine                     , MT.OREMATS.Glauconite          , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_MOON);
868 869
 		new WorldgenOresLarge("ore.large.gold"        , T, T, 20,  30,   5, 3, 16, MT.Pyrite                       , MT.OREMATS.Chalcopyrite        , MT.OREMATS.Arsenopyrite        , MT.Au                          , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_ASTEROIDS);
869 870
 		new WorldgenOresLarge("ore.large.platinum"    , T, T, 40,  50,   5, 3, 16, MT.OREMATS.Cooperite            , MT.Pd                          , MT.OREMATS.Sperrylite          , MT.Ir                          , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_END, ORE_ASTEROIDS);
870 871
 		new WorldgenOresLarge("ore.large.molybdenum"  , T, T, 20,  50,   5, 3, 16, MT.OREMATS.Wulfenite            , MT.OREMATS.Molybdenite         , MT.Mo                          , MT.OREMATS.Powellite           , ORE_OVERWORLD, ORE_EREBUS, ORE_ATUM, ORE_BETWEENLANDS, ORE_MARS, ORE_PLANETS, ORE_END);

+ 2
- 2
src/main/java/gregtech/loaders/c/Loader_Recipes_Ores.java View File

@@ -181,14 +181,14 @@ public class Loader_Recipes_Ores implements Runnable {
181 181
 		if (IL.EB_Dirt_Alfisol      .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Alfisol           .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.dust(MT.Palygorskite, U4));
182 182
 		if (IL.EB_Dirt_Andisol      .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Andisol           .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.dust(MT.VolcanicAsh, U4));
183 183
 		if (IL.EB_Dirt_Gelisol      .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Gelisol           .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.dust(MT.Ice, U4));
184
-		if (IL.EB_Dirt_Histosol     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Histosol          .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.ingot(MT.Peat, U4));
184
+		if (IL.EB_Dirt_Histosol     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Histosol          .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.ingot(MT.Peat, U));
185 185
 		if (IL.EB_Dirt_Inceptisol   .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500                                   }, IL.EB_Dirt_Inceptisol        .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1));
186 186
 		if (IL.EB_Dirt_Mollisol     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500                                   }, IL.EB_Dirt_Mollisol          .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 2, 0), ST.make(Items.melon_seeds, 2, 0), ST.make(Items.pumpkin_seeds, 2, 0), IL.BoP_Turnip_Seeds.get(2), IL.EtFu_Beet_Seeds.get(2, IL.GaSu_Beet_Seeds.get(2)), IL.MaCu_Bait_Worm.get(2));
187 187
 		if (IL.EB_Dirt_Oxisol       .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 8000,   500,   250,   250,   250,   250,   500,  1000                            }, IL.EB_Dirt_Oxisol            .get( 1)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Items.wheat_seeds, 1, 0), ST.make(Items.melon_seeds, 1, 0), ST.make(Items.pumpkin_seeds, 1, 0), IL.BoP_Turnip_Seeds.get(1), IL.EtFu_Beet_Seeds.get(1, IL.GaSu_Beet_Seeds.get(1)), IL.MaCu_Bait_Worm.get(1), OM.dust(MT.Al2O3, U4));
188 188
 		/* Coarse Dirt                      */  RM.Sifting.addRecipe1(T, 16, 100, new long[] {  500,  3000,   250,   100                                                        }, ST.make(Blocks.dirt          ,  1, 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.ClayBrown   ), IL.Clay_Ball_Brown .get(1));
189 189
 		if (IL.EtFu_Dirt            .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] {  500,  3000,   250,   100                                                        }, IL.EtFu_Dirt                 .wild(1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.ClayBrown   ), IL.Clay_Ball_Brown .get(1));
190 190
 		if (IL.BoP_Coarse_Loamy     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] {  500,  3000,  1000,   400                                                        }, IL.BoP_Coarse_Loamy          .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.Palygorskite), IL.Clay_Ball_Blue  .get(1));
191
-		if (IL.BoP_Coarse_Silty     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] {  500,  6000,   250,   100                                                        }, IL.BoP_Coarse_Silty          .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Siltstone , U4), OM.dust(MT.Palygorskite), IL.Clay_Ball_Blue  .get(1));
191
+		if (IL.BoP_Coarse_Silty     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] {  500,  6000,   250,   100                                                        }, IL.BoP_Coarse_Silty          .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Siltstone , U4), OM.dust(MT.Kaolinite   ), IL.Clay_Ball_White .get(1));
192 192
 		if (IL.BoP_Coarse_Sandy     .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 1500,  3000,   250,   100                                                        }, IL.BoP_Coarse_Sandy          .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.Bentonite   ), IL.Clay_Ball_Yellow.get(1));
193 193
 		if (IL.BoP_Dirt_Dried       .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 1000,  2500,   250,   100                                                        }, IL.BoP_Dirt_Dried            .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.Bentonite   ), IL.Clay_Ball_Yellow.get(1));
194 194
 		if (IL.BoP_Dirt_Hard        .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 1000,  2500,   250,   100                                                        }, IL.BoP_Dirt_Hard             .get( 1)/*|*/, ST.make(Blocks.sand, 1, 0), OM.dust(MT.Stone     , U4), OM.dust(MT.Bentonite   ), IL.Clay_Ball_Yellow.get(1));

+ 5
- 4
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -482,11 +482,12 @@ public class Loader_Recipes_Other implements Runnable {
482 482
 		}
483 483
 		
484 484
 		for (OreDictMaterial tClay : ANY.Clay.mToThis) {
485
-		for (OreDictMaterial tMat : ANY.SiO2.mToThis) {
486
-		RM.Mixer            .addRecipeX(T, 16,   64, ST.array(OM.dust(tClay         ,U*2), OM.dust(tMat    ), OM.dust(MT.PotassiumFeldspar    )), OM.dust(MT.Porcelain, U*4));
487
-		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(OM.dust(tClay         , U2), OM.dust(tMat, U4), OM.dust(MT.PotassiumFeldspar, U4)), OM.dust(MT.Porcelain     ));
485
+		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(OM.dust(MT.Redstone), OM.dust(MT.Basalz, U9), OM.dust(tClay), OM.dust(MT.Obsidian)), OM.dust(MT.Petrotheum, 2*U));
488 486
 		}
489
-		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(OM.dust(MT.Redstone       ), OM.dust(MT.Basalz, U9), OM.dust(tClay), OM.dust(MT.Obsidian)), OM.dust(MT.Petrotheum, 2*U));
487
+		for (OreDictMaterial tMat : ANY.SiO2.mToThis) {
488
+		RM.Mixer            .addRecipeX(T, 16,   64, ST.array(IL.Clay_Ball_White.get(2), OM.dust(tMat    ), OM.dust(MT.PotassiumFeldspar    )), OM.dust(MT.Porcelain, U*4));
489
+		RM.Mixer            .addRecipeX(T, 16,   64, ST.array(OM.dust(MT.Kaolinite,U*2), OM.dust(tMat    ), OM.dust(MT.PotassiumFeldspar    )), OM.dust(MT.Porcelain, U*4));
490
+		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(OM.dust(MT.Kaolinite, U2), OM.dust(tMat, U4), OM.dust(MT.PotassiumFeldspar, U4)), OM.dust(MT.Porcelain     ));
490 491
 		}
491 492
 		for (OreDictMaterial tGlowstone : ANY.Glowstone.mToThis) {
492 493
 		RM.Mixer            .addRecipeX(T, 16,   16, ST.array(OM.dust(MT.Stone          ), OM.dust(MT.Netherrack    ), OM.dust(MT.Redstone    ), OM.dust(tGlowstone   )), OM.dust(MT.ArcaneCompound, U2));

BIN
src/main/resources/assets/gregtech/textures/blocks/iconsets/CLAY_WHITE.png View File


BIN
src/main/resources/assets/gregtech/textures/items/gt.multiitem.food/12314.png View File


BIN
src/main/resources/assets/gregtech/textures/items/gt.multiitem.randomtools/899.png View File


Loading…
Cancel
Save