Browse Source

Added BBQ/Barbecue Sauce

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

+ 4
- 3
CHANGELOG.md View File

@@ -1,18 +1,19 @@
1 1
 This is the most recent Changelog. It also contains some of the changes inside the >>>UPCOMING<<< Versions (most of the time). This is for 1.7.10 btw.
2 2
 
3 3
 
4
-6.14.11: (Not released yet, happens whenever a Bugfix needs to be released, Bear is still testing GT6, while I'm working on my Game)
4
+6.14.11: (Not released yet, released whenever it needs to be)
5 5
 Nothing (I tend to only add finished Stuff to the Changelog).
6 6
 
7 7
 
8
-6.14.10: (Not released yet, happens whenever a Bugfix needs to be released, Bear is still testing GT6, while I'm working on my Game)
8
+6.14.10: (Not released yet, released whenever it needs to be)
9 9
 Nothing (I tend to only add finished Stuff to the Changelog).
10 10
 
11 11
 
12
-6.14.09: (Not released yet, happens whenever a Bugfix needs to be released, Bear is still testing GT6, while I'm working on my Game)
12
+6.14.09: (Not released yet, released whenever it needs to be)
13 13
 [COMPAT] Aroma1997's Mining Dimension is now Compatible with my Worldgen.
14 14
 [FIXED] Chainsaws used WAY too much durability for Treecapitation!
15 15
 [FIXED] Worldgeneration in different Dimensions had the same RNG as on the Overworld. Now the Seed is being XOR-ed with the Dimension ID to prevent that. This has the convenient Side Effect of the Overworld staying the same as before, because it's ID is Zero.
16
+[ADDED] Barbecue Sauce (BBQ Sauce), because why not.
16 17
 [ADDED] Axes, Saws and Chainsaws can now place Saplings too. They will still place Workbenches if Saplings cant be placed.
17 18
 [ADDED] Tooltip for Covers that can be controlled with the Cover Controller Cover. In case of Covers where the Cover Controller Cover is required (such as Shutter Cover), it will be Cyan instead of Dark Gray to make it easier to see.
18 19
 

+ 11
- 8
src/main/java/gregapi/data/FL.java View File

@@ -262,35 +262,38 @@ public enum FL {
262 262
 	, Cream_Chocolate           ("chocolatecream"                                           , SIMPLE, LIQUID, FOOD)
263 263
 	, Cream_Coconut             ("coconutcream"                                             , SIMPLE, LIQUID, FOOD)
264 264
 	, Cream_Nutella             ("nutella"                                                  , SIMPLE, LIQUID, FOOD)
265
-
265
+	
266
+	, Ketchup                   ("ketchup"                                                  , SIMPLE, LIQUID, FOOD)
267
+	
266 268
 	, Mayo                      ("mayo"                                                     , SIMPLE, LIQUID, FOOD)
267 269
 	, Dressing                  ("potion.dressing"                                          , SIMPLE, LIQUID, FOOD)
268
-
270
+	
269 271
 	, Soup_Mushroom             ("mushroomsoup"                                             , SIMPLE, LIQUID, FOOD)
270
-
272
+	
271 273
 	, Sauce_Chili               ("chillysauce"              , "potion.chillysauce"          , SIMPLE, LIQUID, FOOD)
272 274
 	, Sauce_Hot                 ("potion.hotsauce"                                          , SIMPLE, LIQUID, FOOD)
273 275
 	, Sauce_Diabolo             ("potion.diabolosauce"                                      , SIMPLE, LIQUID, FOOD)
274 276
 	, Sauce_Diablo              ("potion.diablosauce"                                       , SIMPLE, LIQUID, FOOD)
275 277
 	, Sauce_Snitches            ("potion.diablosauce.strong"                                , SIMPLE, LIQUID, FOOD)
276
-
278
+	, Sauce_BBQ                 ("bbqsauce"                                                 , SIMPLE, LIQUID, FOOD)
279
+	
277 280
 	, Slime_Pink                ("pinkslime"                                                , SIMPLE, LIQUID, FOOD, SLIME)
278 281
 	, Slime_Green               ("slime"                                                    , SIMPLE, LIQUID, FOOD, SLIME)
279 282
 	, BAWLS                     ("bawls"                                                    , SIMPLE, LIQUID, FOOD)
280
-
283
+	
281 284
 	, Tea                       ("tea"                      , "potion.tea"                  , SIMPLE, LIQUID, FOOD, THERMOS, TEA)
282 285
 	, Tea_Sweet                 ("sweettea"                 , "potion.sweettea"             , SIMPLE, LIQUID, FOOD, THERMOS, TEA)
283 286
 	, Tea_Ice                   ("icetea"                   , "potion.icetea"               , SIMPLE, LIQUID, FOOD, THERMOS, TEA)
284
-
287
+	
285 288
 	, Purple_Drink              ("purpledrink"              , "potion.purpledrink"          , SIMPLE, LIQUID, FOOD)
286 289
 	, Lemonade                  ("potion.lemonade"                                          , SIMPLE, LIQUID, FOOD)
287 290
 	, Grenade_Juice             ("potion.cavejohnsonsgrenadejuice"                          , SIMPLE, LIQUID, FOOD)
288
-
291
+	
289 292
 	, Vinegar_Grape             ("vinegar"                  , "potion.vinegar"              , SIMPLE, LIQUID, FOOD, ALCOHOLIC, VINEGAR)
290 293
 	, Vinegar_Apple             ("applevinegar"                                             , SIMPLE, LIQUID, FOOD, ALCOHOLIC, VINEGAR)
291 294
 	, Vinegar_Cane              ("canevinegar"                                              , SIMPLE, LIQUID, FOOD, ALCOHOLIC, VINEGAR)
292 295
 	, Vinegar_Rice              ("ricevinegar"                                              , SIMPLE, LIQUID, FOOD, ALCOHOLIC, VINEGAR)
293
-
296
+	
294 297
 	, Wine_Fruit                ("binnie.juice"                                             , SIMPLE, LIQUID, FOOD, ALCOHOLIC, WINE)
295 298
 	, Wine_Lemon                ("limoncello"               , "potion.limoncello"           , SIMPLE, LIQUID, FOOD, ALCOHOLIC, WINE)
296 299
 	, Wine_Agave                ("binnie.wineagave"                                         , SIMPLE, LIQUID, FOOD, ALCOHOLIC, WINE)

+ 3
- 0
src/main/java/gregapi/load/LoaderOreDictReRegistrations.java View File

@@ -169,6 +169,8 @@ public class LoaderOreDictReRegistrations implements Runnable {
169 169
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodPineapplecider"      , "foodAnanascider");
170 170
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodPineapplewine"       , "foodAnanaswine");
171 171
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodGrapefruitsmoothie"  , "foodGrapefruitjellysmoothie");
172
+		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodBarbecuesauce"       , "foodBBQsauce");
173
+		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodBarbecuesauce"       , "foodBbqsauce");
172 174
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("leafTobacco"             , "cropTobacco");
173 175
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("leafCoca"                , "cropCoca");
174 176
 		OreDictManager.INSTANCE.addReRegistrationWithReversal("foodCoffeeBeans"         , "cropCoffee");
@@ -835,6 +837,7 @@ public class LoaderOreDictReRegistrations implements Runnable {
835 837
 		OreDictManager.INSTANCE.addReRegistration("foodWhiskey"                     , "listAllbeverage");
836 838
 		OreDictManager.INSTANCE.addReRegistration("foodWine"                        , "listAllbeverage");
837 839
 		OreDictManager.INSTANCE.addReRegistration("bottleHoneydew"                  , "listAllbeverage");
840
+		OreDictManager.INSTANCE.addReRegistration("foodBarbecuesauce"               , "listAllcondiment");
838 841
 		OreDictManager.INSTANCE.addReRegistration("foodHotsauce"                    , "listAllcondiment");
839 842
 		OreDictManager.INSTANCE.addReRegistration("foodMayo"                        , "listAllcondiment");
840 843
 		OreDictManager.INSTANCE.addReRegistration("foodKetchup"                     , "listAllcondiment");

+ 4
- 3
src/main/java/gregtech/items/MultiItemBottles.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
  *
@@ -116,6 +116,7 @@ public class MultiItemBottles extends MultiItemRandom implements IItemRottable {
116 116
 		addItem(tLastID =   802, "Diabolo Sauce"                , "", "foodHotsauce"                    , FL.Sauce_Diabolo          .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENENUM        , 2), TC.stack(TC.IGNIS     , 3), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN);
117 117
 		addItem(tLastID =   803, "Diablo Sauce"                 , "", "foodHotsauce"                    , FL.Sauce_Diablo           .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENENUM        , 2), TC.stack(TC.IGNIS     , 4), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN);
118 118
 		addItem(tLastID =   804, "Old Man Snitches glitchy Diablo Sauce", "", "foodHotsauce"            , FL.Sauce_Snitches         .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENENUM        , 3), TC.stack(TC.IGNIS     , 5), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN);
119
+		addItem(tLastID =   805, "Barbecue Sauce"               , "", "foodBarbecuesauce"               , FL.Sauce_BBQ              .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.LIMUS          , 1), TC.stack(TC.FAMES     , 1), FoodStatFluid.INSTANCE);
119 120
 		
120 121
 		
121 122
 		addItem(tLastID =   900, "Apple Juice"                  , "", "foodApplejuice"                  , FL.Juice_Apple            .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.AQUA           , 1), TC.stack(TC.HERBA     , 1), FoodStatFluid.INSTANCE, FL.Juice_AppleGrC.make(250));
@@ -225,9 +226,9 @@ public class MultiItemBottles extends MultiItemRandom implements IItemRottable {
225 226
 		addItem(tLastID =  3005, "Gooseberry Smoothie"          , "", "foodGooseberrysmoothie"          , FL.Smoothie_Gooseberry    .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.GELUM          , 1), TC.stack(TC.FAMES     , 1), FoodStatFluid.INSTANCE);
226 227
 		
227 228
 		addItem(tLastID =  3100, "Tomato Juice"                 , "", "foodTomatojuice"                 , FL.Juice_Tomato           .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.AQUA           , 1), TC.stack(TC.HERBA     , 1), FoodStatFluid.INSTANCE);
228
-		addItem(tLastID =  3101, "Tomato Ketchup"               , "", "foodKetchup"                     , FL.make("ketchup"      , 250), TC.stack(TC.VITREUS, 1), TC.stack(TC.LIMUS          , 1), TC.stack(TC.FAMES     , 1), FoodStatFluid.INSTANCE);
229
+		addItem(tLastID =  3101, "Tomato Ketchup"               , "", "foodKetchup"                     , FL.Ketchup                .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.LIMUS          , 1), TC.stack(TC.FAMES     , 1), FoodStatFluid.INSTANCE);
229 230
 		
230
-		addItem(tLastID =  3200, "Golden Carrot Juice"          , "", "foodCarrotjuice"             , FL.make("goldencarrotjuice", 250), TC.stack(TC.VITREUS, 1), TC.stack(TC.AQUA           , 1), TC.stack(TC.SENSUS    , 2), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN);
231
+		addItem(tLastID =  3200, "Golden Carrot Juice"          , "", "foodCarrotjuice"                 , FL.make("goldencarrotjuice"   , 250), TC.stack(TC.VITREUS, 1), TC.stack(TC.AQUA           , 1), TC.stack(TC.SENSUS    , 2), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN);
231 232
 		
232 233
 		addItem(tLastID =  3300, "Carrot Juice"                 , "", "foodCarrotjuice"                 , FL.Juice_Carrot           .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.AQUA           , 1), TC.stack(TC.SENSUS    , 1), FoodStatFluid.INSTANCE);
233 234
 		

+ 2
- 1
src/main/java/gregtech/loaders/a/Loader_Fluids.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
  *
@@ -555,6 +555,7 @@ public class Loader_Fluids implements Runnable {
555 555
 		new FoodStatDrink(FL.create("grcmilk.cream"                              , "Heavy Cream"                             , null                  , 1, 1000, 275, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , ""                                                                ,  2, 0.4F  ,  20, C+37,  0.75F,  0,  0,  0, 20, 20, EnumAction.drink, F, F, F);
556 556
 		new FoodStatDrink(FL.create("coconutcream"                               , "Coconut Cream"                           , null                  , 1, 1000, 275, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , ""                                                                ,  2, 0.4F  ,  20, C+37,  0.75F,  0,  0,  0, 15, 15, EnumAction.drink, F, F, F);
557 557
 		new FoodStatDrink(FL.create("ketchup"                                    , "Tomato Ketchup"                          , null                  , 1, 1000, 300, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , "this tooltip doesn't make sans"                                  ,  4, 0.3F  ,  20, C+37,  0.50F,  0,  0,  0, 30,  0, EnumAction.drink, F, F, F, Potion.heal                     .id,   0, 0,  10, Potion.moveSpeed.id, 200, 0,  20);
558
+		new FoodStatDrink(FL.create("bbqsauce"                                   , "Barbecue Sauce"                          , null                  , 1, 1000, 300, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , "Also  called BBQ Sauce"                                          ,  4, 0.3F  ,  20, C+37,  0.50F,  0,  0,  0, 30,  0, EnumAction.drink, F, F, F, Potion.heal                     .id,   0, 0,  10, Potion.moveSpeed.id, 200, 0,  20);
558 559
 		new FoodStatDrink(FL.create("chocolatecream"                             , "Chocolate Cream"                         , null                  , 1, 1000, 275, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , ""                                                                ,  4, 0.2F  ,   5, C+37,  0.15F,  0,  0,  0, 30, 20, EnumAction.eat  , F, F, F);
559 560
 		new FoodStatDrink(FL.create("nutella"                                    , "Nutella"                                 , null                  , 1, 1000, 275, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , "For Germans: It is 'die' Nutella, not 'der' nor 'das'"           ,  8, 0.4F  ,   5, C+37,  0.15F,  0,  0,  0, 20, 30, EnumAction.eat  , F, F, F);
560 561
 		new FoodStatDrink(FL.create("peanutbutter"                               , "Peanut Butter"                           , null                  , 1, 1000, 300, FluidsGT.SIMPLE, FluidsGT.FOOD)                                                                , "This is NUTS!!!"                                                 ,  8, 0.4F  ,   5, C+37,  0.15F,  0,  0,  0, 20, 30, EnumAction.eat  , F, F, F);

+ 63
- 62
src/main/java/gregtech/loaders/c/Loader_Recipes_Food.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
  *
@@ -587,84 +587,85 @@ public class Loader_Recipes_Food implements Runnable {
587 587
 		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.make("potion.darkcoffee"         , 750), FL.make("potion.coffee"              , 750), ZL_IS);
588 588
 		}
589 589
 		for (ItemStack tStack : ST.array(dust.mat(MT.Peanut, 1), dustSmall.mat(MT.Peanut, 4), dustTiny.mat(MT.Peanut,  9))) {
590
-		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream                               .make(250), FL.Nutbutter_Peanut                     .make(250), ZL_IS);
590
+		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream                        .make(250), FL.Nutbutter_Peanut              .make(250), ZL_IS);
591 591
 		}
592 592
 		for (ItemStack tStack : ST.array(dust.mat(MT.Hazelnut, 1), dustSmall.mat(MT.Hazelnut, 4), dustTiny.mat(MT.Hazelnut,  9))) {
593
-		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream_Chocolate                     .make(250), FL.Cream_Nutella                        .make(250), ZL_IS);
593
+		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream_Chocolate              .make(250), FL.Cream_Nutella                 .make(250), ZL_IS);
594 594
 		}
595 595
 		for (ItemStack tStack : ST.array(dust.mat(MT.Chocolate, 1), dustSmall.mat(MT.Chocolate, 4), dustTiny.mat(MT.Chocolate,  9))) {
596
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Milk                                .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
597
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.MilkGrC                             .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
598
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.MilkSoy                             .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
599
-		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream                               .make(250), FL.Cream_Chocolate                      .make(250), ZL_IS);
596
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Milk                         .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
597
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.MilkGrC                      .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
598
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.MilkSoy                      .make(750), FL.make("potion.darkchocolatemilk"   , 750), ZL_IS);
599
+		RM.Mixer            .addRecipe1(T, 16,   64, tStack, FL.Cream                        .make(250), FL.Cream_Chocolate               .make(250), ZL_IS);
600 600
 		}
601 601
 		for (ItemStack tStack : ST.array(gemChipped.mat(MT.Sugar, 4), dust.mat(MT.Sugar, 1), dustSmall.mat(MT.Sugar, 4), dustTiny.mat(MT.Sugar, 9))) {
602 602
 		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.make("potion.coffee"             , 750), FL.make("potion.cafeaulait"          , 750), ZL_IS);
603 603
 		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.make("potion.cafeaulait"         , 750), FL.make("potion.laitaucafe"          , 750), ZL_IS);
604 604
 		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.make("potion.darkcoffee"         , 750), FL.make("potion.darkcafeaulait"      , 750), ZL_IS);
605 605
 		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.make("potion.darkchocolatemilk"  , 750), FL.make("chocolatemilk"              , 750), ZL_IS);
606
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Juice_Lemon                         .make(750), FL.Lemonade                             .make(750), ZL_IS);
607
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Juice_Tomato                        .make(750), FL.make("ketchup"                    , 750), ZL_IS);
608
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Tea                                 .make(750), FL.Tea_Sweet                            .make(750), ZL_IS);
606
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Juice_Lemon                  .make(750), FL.Lemonade                      .make(750), ZL_IS);
607
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Juice_Tomato                 .make(750), FL.Ketchup                       .make(750), ZL_IS);
608
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Tea                          .make(750), FL.Tea_Sweet                     .make(750), ZL_IS);
609 609
 		}
610 610
 		for (ItemStack tStack : ST.array(dust.mat(MT.Chili, 1), dustSmall.mat(MT.Chili, 4), dustTiny.mat(MT.Chili,  9))) {
611 611
 		RM.Mixer            .addRecipe2(T, 16,   16, tStack, IL.Food_PotatoChips.get(1), IL.Food_ChiliChips.get(1));
612
-		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Sauce_Chili                         .make(750), FL.make("potion.hotsauce"            , 750), ZL_IS);
612
+		RM.Mixer            .addRecipe1(T, 16,   48, tStack, FL.Sauce_Chili                  .make(750), FL.make("potion.hotsauce"            , 750), ZL_IS);
613 613
 		}
614
-		for (String tCookingOil : FluidsGT.COOKING_OIL) if (FL.exists(tCookingOil)) for (String tVinegar : FluidsGT.VINEGAR) if (FL.exists(tVinegar))
614
+		for (String tCookingOil : FluidsGT.COOKING_OIL) if (FL.exists(tCookingOil)) for (String tVinegar : FluidsGT.VINEGAR) if (FL.exists(tVinegar)) {
615 615
 		RM.Mixer            .addRecipe1(T, 16,   16, OM.dust(MT.NaCl), FL.array(FL.make(tCookingOil, 100), FL.make(tVinegar, 100)), FL.Dressing.make(250), ZL_IS);
616
+		RM.Mixer            .addRecipe2(T, 16,   32, OM.dust(MT.NaCl), OM.dust(MT.PepperBlack), FL.array(FL.Ketchup.make(250), FL.make(tVinegar, 125)), FL.Sauce_BBQ.make(500), ZL_IS);
617
+		}
616 618
 		
617
-		
618
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Plum        .make(125), FL.Juice_Apple  .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
619
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_White .make(125), FL.Juice_Apple  .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
620
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Green .make(125), FL.Juice_Apple  .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
621
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Red   .make(125), FL.Juice_Apple  .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
622
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Purple.make(125), FL.Juice_Apple  .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
623
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_White .make(125), FL.Juice_Plum   .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
624
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Green .make(125), FL.Juice_Plum   .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
625
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Red   .make(125), FL.Juice_Plum   .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
626
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Purple.make(125), FL.Juice_Plum   .make(125)), FL.Med_Laxative    .make(250), ZL_IS);
627
-		
628
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Sap_Rainbow       .make(125), FL.Ambrosia     .make(125)), FL.Med_Heal        .make(250), ZL_IS);
629
-		
630
-		
631
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice               .make(125)), FL.Smoothie_Fruit          .make(250), ZL_IS);
632
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Ananas        .make(125)), FL.Smoothie_Ananas         .make(250), ZL_IS);
633
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Apple         .make(125)), FL.Smoothie_Apple          .make(250), ZL_IS);
634
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_AppleGrC      .make(125)), FL.Smoothie_Apple          .make(250), ZL_IS);
635
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Apricot       .make(125)), FL.Smoothie_Apricot        .make(250), ZL_IS);
636
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Banana        .make(125)), FL.Smoothie_Banana         .make(250), ZL_IS);
637
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Blackberry    .make(125)), FL.Smoothie_Blackberry     .make(250), ZL_IS);
638
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Blueberry     .make(125)), FL.Smoothie_Blueberry      .make(250), ZL_IS);
639
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Cherry        .make(125)), FL.Smoothie_Cherry         .make(250), ZL_IS);
640
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Cranberry     .make(125)), FL.Smoothie_Cranberry      .make(250), ZL_IS);
641
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Currant       .make(125)), FL.Smoothie_Currant        .make(250), ZL_IS);
642
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Elderberry    .make(125)), FL.Smoothie_Elderberry     .make(250), ZL_IS);
643
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Gooseberry    .make(125)), FL.Smoothie_Gooseberry     .make(250), ZL_IS);
644
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Red     .make(125)), FL.Smoothie_Grape_Red      .make(250), ZL_IS);
645
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_White   .make(125)), FL.Smoothie_Grape_White    .make(250), ZL_IS);
646
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Green   .make(125)), FL.Smoothie_Grape_Green    .make(250), ZL_IS);
647
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Purple  .make(125)), FL.Smoothie_Grape_Purple   .make(250), ZL_IS);
648
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grapefruit    .make(125)), FL.Smoothie_Grapefruit     .make(250), ZL_IS);
649
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Kiwi          .make(125)), FL.Smoothie_Kiwi           .make(250), ZL_IS);
650
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Lemon         .make(125)), FL.Smoothie_Lemon          .make(250), ZL_IS);
651
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Lime          .make(125)), FL.Smoothie_Lime           .make(250), ZL_IS);
652
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Melon         .make(125)), FL.Smoothie_Melon          .make(250), ZL_IS);
653
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Orange        .make(125)), FL.Smoothie_Orange         .make(250), ZL_IS);
654
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Persimmon     .make(125)), FL.Smoothie_Persimmon      .make(250), ZL_IS);
655
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Peach         .make(125)), FL.Smoothie_Peach          .make(250), ZL_IS);
656
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Pear          .make(125)), FL.Smoothie_Pear           .make(250), ZL_IS);
657
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Plum          .make(125)), FL.Smoothie_Plum           .make(250), ZL_IS);
658
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Raspberry     .make(125)), FL.Smoothie_Raspberry      .make(250), ZL_IS);
659
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Strawberry    .make(125)), FL.Smoothie_Strawberry     .make(250), ZL_IS);
660
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Mango         .make(125)), FL.Smoothie_Mango          .make(250), ZL_IS);
661
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Starfruit     .make(125)), FL.Smoothie_Starfruit      .make(250), ZL_IS);
662
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Fig           .make(125)), FL.Smoothie_Fig            .make(250), ZL_IS);
663
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Pomegranate   .make(125)), FL.Smoothie_Pomegranate    .make(250), ZL_IS);
664
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Papaya        .make(125)), FL.Smoothie_Papaya         .make(250), ZL_IS);
665
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Coconut       .make(125)), FL.Smoothie_Coconut        .make(250), ZL_IS);
619
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Plum        .make(125), FL.Juice_Apple.make(125)), FL.Med_Laxative.make(250), ZL_IS);
620
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_White .make(125), FL.Juice_Apple.make(125)), FL.Med_Laxative.make(250), ZL_IS);
621
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Green .make(125), FL.Juice_Apple.make(125)), FL.Med_Laxative.make(250), ZL_IS);
622
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Red   .make(125), FL.Juice_Apple.make(125)), FL.Med_Laxative.make(250), ZL_IS);
623
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Purple.make(125), FL.Juice_Apple.make(125)), FL.Med_Laxative.make(250), ZL_IS);
624
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_White .make(125), FL.Juice_Plum .make(125)), FL.Med_Laxative.make(250), ZL_IS);
625
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Green .make(125), FL.Juice_Plum .make(125)), FL.Med_Laxative.make(250), ZL_IS);
626
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Red   .make(125), FL.Juice_Plum .make(125)), FL.Med_Laxative.make(250), ZL_IS);
627
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Juice_Grape_Purple.make(125), FL.Juice_Plum .make(125)), FL.Med_Laxative.make(250), ZL_IS);
628
+		
629
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Sap_Rainbow       .make(125), FL.Ambrosia   .make(125)), FL.Med_Heal    .make(250), ZL_IS);
630
+		
631
+		
632
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice             .make(125)), FL.Smoothie_Fruit       .make(250), ZL_IS);
633
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Ananas      .make(125)), FL.Smoothie_Ananas      .make(250), ZL_IS);
634
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Apple       .make(125)), FL.Smoothie_Apple       .make(250), ZL_IS);
635
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_AppleGrC    .make(125)), FL.Smoothie_Apple       .make(250), ZL_IS);
636
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Apricot     .make(125)), FL.Smoothie_Apricot     .make(250), ZL_IS);
637
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Banana      .make(125)), FL.Smoothie_Banana      .make(250), ZL_IS);
638
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Blackberry  .make(125)), FL.Smoothie_Blackberry  .make(250), ZL_IS);
639
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Blueberry   .make(125)), FL.Smoothie_Blueberry   .make(250), ZL_IS);
640
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Cherry      .make(125)), FL.Smoothie_Cherry      .make(250), ZL_IS);
641
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Cranberry   .make(125)), FL.Smoothie_Cranberry   .make(250), ZL_IS);
642
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Currant     .make(125)), FL.Smoothie_Currant     .make(250), ZL_IS);
643
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Elderberry  .make(125)), FL.Smoothie_Elderberry  .make(250), ZL_IS);
644
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Gooseberry  .make(125)), FL.Smoothie_Gooseberry  .make(250), ZL_IS);
645
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Red   .make(125)), FL.Smoothie_Grape_Red   .make(250), ZL_IS);
646
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_White .make(125)), FL.Smoothie_Grape_White .make(250), ZL_IS);
647
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Green .make(125)), FL.Smoothie_Grape_Green .make(250), ZL_IS);
648
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grape_Purple.make(125)), FL.Smoothie_Grape_Purple.make(250), ZL_IS);
649
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Grapefruit  .make(125)), FL.Smoothie_Grapefruit  .make(250), ZL_IS);
650
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Kiwi        .make(125)), FL.Smoothie_Kiwi        .make(250), ZL_IS);
651
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Lemon       .make(125)), FL.Smoothie_Lemon       .make(250), ZL_IS);
652
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Lime        .make(125)), FL.Smoothie_Lime        .make(250), ZL_IS);
653
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Melon       .make(125)), FL.Smoothie_Melon       .make(250), ZL_IS);
654
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Orange      .make(125)), FL.Smoothie_Orange      .make(250), ZL_IS);
655
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Persimmon   .make(125)), FL.Smoothie_Persimmon   .make(250), ZL_IS);
656
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Peach       .make(125)), FL.Smoothie_Peach       .make(250), ZL_IS);
657
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Pear        .make(125)), FL.Smoothie_Pear        .make(250), ZL_IS);
658
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Plum        .make(125)), FL.Smoothie_Plum        .make(250), ZL_IS);
659
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Raspberry   .make(125)), FL.Smoothie_Raspberry   .make(250), ZL_IS);
660
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Strawberry  .make(125)), FL.Smoothie_Strawberry  .make(250), ZL_IS);
661
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Mango       .make(125)), FL.Smoothie_Mango       .make(250), ZL_IS);
662
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Starfruit   .make(125)), FL.Smoothie_Starfruit   .make(250), ZL_IS);
663
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Fig         .make(125)), FL.Smoothie_Fig         .make(250), ZL_IS);
664
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Pomegranate .make(125)), FL.Smoothie_Pomegranate .make(250), ZL_IS);
665
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Papaya      .make(125)), FL.Smoothie_Papaya      .make(250), ZL_IS);
666
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.Juice_Coconut     .make(125)), FL.Smoothie_Coconut     .make(250), ZL_IS);
666 667
 		for (String tJuice : FluidsGT.FRUIT_JUICE) if (FL.exists(tJuice)) {
667
-		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.make(tJuice      , 125)), FL.Smoothie_Fruit          .make(250), ZL_IS);
668
+		RM.Mixer            .addRecipe0(T, 16,   16, FL.array(FL.Ice.make(125), FL.make(tJuice           , 125)), FL.Smoothie_Fruit       .make(250), ZL_IS);
668 669
 		RM.CryoMixer        .addRecipe0(T, 16,   16, FL.array(FL.make(tJuice, 125), FL.Tea_Sweet.make(125)), FL.Tea_Ice.make(250), ZL_IS);
669 670
 		}
670 671
 	}

BIN
src/main/resources/assets/gregtech/textures/blocks/fluids/bbqsauce.png View File


+ 5
- 0
src/main/resources/assets/gregtech/textures/blocks/fluids/bbqsauce.png.mcmeta View File

@@ -0,0 +1,5 @@
1
+{ 
2
+   "animation":{
3
+      "frametime":2
4
+   }
5
+}

BIN
src/main/resources/assets/gregtech/textures/items/gt.multiitem.bottles/805.png View File


Loading…
Cancel
Save