Skip to content

Commit

Permalink
had to remove two references in the light of recent events
Browse files Browse the repository at this point in the history
  • Loading branch information
@GregoriusT
GregoriusT committed Nov 24, 2023
1 parent d7ccfe8 commit 63ed237
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/main/java/gregapi/data/FL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ public enum FL {
, Sauce_Hot ("potion.hotsauce" , SIMPLE, LIQUID, FOOD)
, Sauce_Diabolo ("potion.diabolosauce" , SIMPLE, LIQUID, FOOD)
, Sauce_Diablo ("potion.diablosauce" , SIMPLE, LIQUID, FOOD)
, Sauce_Snitches ("potion.diablosauce.strong" , SIMPLE, LIQUID, FOOD)
, Sauce_Cow_Level ("potion.diablosauce.strong" , SIMPLE, LIQUID, FOOD)
, Sauce_BBQ ("bbqsauce" , SIMPLE, LIQUID, FOOD)

, Slime_Blue ("slime.blue" , SIMPLE, LIQUID, FOOD, SLIME)
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/gregapi/load/LoaderUnificationTargets.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@ public void run() {
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.OREMATS.Scheelite , MD.EtFu, "modded_raw_ore", 9);
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.TiO2 , MD.EtFu, "modded_raw_ore",10);
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.Zn , MD.EtFu, "modded_raw_ore",11);
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.OREMATS.Magnesite , MD.EtFu, "modded_raw_ore",12);
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.MgCO3 , MD.EtFu, "modded_raw_ore",12);
OreDictManager.INSTANCE.setTarget(OP.oreRaw , MT.OREMATS.Borax , MD.EtFu, "modded_raw_ore",13);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.Cu , MD.EtFu, "raw_ore_block", 0);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.Fe , MD.EtFu, "raw_ore_block", 1);
Expand All @@ -1190,7 +1190,7 @@ public void run() {
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.OREMATS.Scheelite , MD.EtFu, "modded_raw_ore_block", 9);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.TiO2 , MD.EtFu, "modded_raw_ore_block",10);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.Zn , MD.EtFu, "modded_raw_ore_block",11);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.OREMATS.Magnesite , MD.EtFu, "modded_raw_ore_block",12);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.MgCO3 , MD.EtFu, "modded_raw_ore_block",12);
OreDictManager.INSTANCE.setTarget(OP.blockRaw , MT.OREMATS.Borax , MD.EtFu, "modded_raw_ore_block",13);
OreDictManager.INSTANCE.setTarget(OP.blockDust , MT.Bone , MD.EtFu, "bone", 0);
OreDictManager.INSTANCE.setTarget(OP.nugget , MT.Fe , MD.EtFu, "nugget_iron", 0);
Expand Down Expand Up @@ -1223,7 +1223,7 @@ public void run() {
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.OREMATS.Scheelite , MD.EtFu, "modded_deepslate_ore", 9);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.TiO2 , MD.EtFu, "modded_deepslate_ore",10);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.Zn , MD.EtFu, "modded_deepslate_ore",11);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.OREMATS.Magnesite , MD.EtFu, "modded_deepslate_ore",12);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.MgCO3 , MD.EtFu, "modded_deepslate_ore",12);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.OREMATS.Borax , MD.EtFu, "modded_deepslate_ore",13);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.OREMATS.Cinnabar , MD.EtFu, "deepslate_thaumcraft_ore", 0);
OreDictManager.INSTANCE.setTarget(OP.oreDeepslate , MT.InfusedAir , MD.EtFu, "deepslate_thaumcraft_ore", 1);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/items/MultiItemBottles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void addItems() {
addItem( 801, "Hot Sauce" , "", "foodHotsauce" , FL.Sauce_Hot .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENEMUM , 1), TC.stack(TC.IGNIS , 2), FoodStatFluid.INSTANCE); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Red);
addItem( 802, "Diabolo Sauce" , "", "foodHotsauce" , FL.Sauce_Diabolo .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENEMUM , 2), TC.stack(TC.IGNIS , 3), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Red);
addItem( 803, "Diablo Sauce" , "", "foodHotsauce" , FL.Sauce_Diablo .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENEMUM , 2), TC.stack(TC.IGNIS , 4), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Red);
addItem( 804, "Old Man Snitches glitchy Diablo Sauce", "", "foodHotsauce" , FL.Sauce_Snitches .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENEMUM , 3), TC.stack(TC.IGNIS , 5), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Red);
addItem( 804, "There is no Cow Sauce" , "", "foodHotsauce" , FL.Sauce_Cow_Level .make(250), TC.stack(TC.VITREUS, 1), TC.stack(TC.VENEMUM , 3), TC.stack(TC.IGNIS , 5), FoodStatFluid.INSTANCE, TD.Creative.HIDDEN); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Red);
addItem( 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); Sandwiches.INGREDIENTS.put(last(), DYE_INDEX_Brown);


Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/items/MultiItemFood.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ public void addItems() {
CR.shaped(IL.Food_Onion_Sliced.get(4), CR.DEF_NCC, "kX", 'X', "cropOnion");


IL.Food_Cucumber .set(addItem( 40, "Cucumber" , "Not a Sea Cucumber!", "cropCucumber" , new FoodStat( 1, 1.200F, 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)));
IL.Food_Cucumber_Sliced .set(addItem( 41, "Cucumber Slice" , "QUEWWWCUMMMBURRR!!!" , new FoodStat( 0, 0.300F, 0, C+36, 0.30F, 0, 0, 0, 1, 0, EnumAction.eat, null , F, T, F, T), TC.stack(TC.HERBA, 1))); Sandwiches.INGREDIENTS.put(last(), (byte)23);
IL.Food_Cucumber .set(addItem( 40, "Cucumber" , "Is it a type of Melon or a type of Pumpkin?", "cropCucumber" , new FoodStat( 1, 1.200F, 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)));
IL.Food_Cucumber_Sliced .set(addItem( 41, "Cucumber Slice" , "Not a sliced Sea Cucumber!" , new FoodStat( 0, 0.300F, 0, C+36, 0.30F, 0, 0, 0, 1, 0, EnumAction.eat, null , F, T, F, T), TC.stack(TC.HERBA, 1))); Sandwiches.INGREDIENTS.put(last(), (byte)23);
IL.Food_Pickle .set(addItem( 42, "Pickle" , "Not a Sea Pickle! Not Rick either!", "cropPickle", "foodPickles", new FoodStat( 1, 1.200F, 0, C+36, 0.30F, 4, 0, 0, 4, 0, EnumAction.eat, null , F, T, F, T), TC.stack(TC.MESSIS, 1), TC.stack(TC.HERBA, 1), TC.stack(TC.VENEMUM, 1)));
IL.Food_Pickle_Sliced .set(addItem( 43, "Pickle Slice" , "You seem to be in a Pickle." , new FoodStat( 0, 0.300F, 0, C+36, 0.30F, 1, 0, 0, 1, 0, EnumAction.eat, null , F, T, F, T), TC.stack(TC.HERBA, 1))); Sandwiches.INGREDIENTS.put(last(), (byte)41);
RM.replicateOrganic( 4, 8, IL.Food_Cucumber.get(1));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/a/Loader_Fluids.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ public void run() {
new FoodStatDrink(FL.create("potion.hotsauce" , "Hot Sauce" , null , 1, 1000, 325, FluidsGT.SIMPLE, FluidsGT.FOOD) , "Very Spicy, I guess?" , 2, 0.1F , 10, C+44, 0.50F, 0, 0, 20, 10, 0, EnumAction.drink, F, F, F, PotionsGT.ID_FLAMMABLE, 300, 0, 70, Potion.confusion .id,2000, 0, 30, Potion.fireResistance.id,2000, 0, 70, PotionsGT.ID_DEHYDRATION , 400, 1, 100);
new FoodStatDrink(FL.create("potion.diabolosauce" , "Diabolo Sauce" , null , 1, 1000, 350, FluidsGT.SIMPLE, FluidsGT.FOOD) , "As if the Devil made this Sauce" , 2, 0.1F , 10, C+46, 0.50F, 0, 0, 30, 10, 0, EnumAction.drink, F, F, F, PotionsGT.ID_FLAMMABLE, 300, 1, 70, Potion.confusion .id,3000, 1, 50, Potion.fireResistance.id,3000, 0, 80, PotionsGT.ID_DEHYDRATION , 400, 2, 100, PotionsGT.ID_INSANITY , 600, 0, 100);
new FoodStatDrink(FL.create("potion.diablosauce" , "Diablo Sauce" , null , 1, 1000, 375, FluidsGT.SIMPLE, FluidsGT.FOOD, FluidsGT.ACID) , "Diablo always comes back!" , 2, 0.1F , 10, C+48, 0.50F, 0, 0, 40, 10, 0, EnumAction.drink, F, F, F, PotionsGT.ID_FLAMMABLE, 300, 1, 70, Potion.confusion .id,4000, 1, 70, Potion.fireResistance.id,4000, 0, 90, PotionsGT.ID_DEHYDRATION , 400, 3, 100, PotionsGT.ID_INSANITY , 600, 1, 100);
new FoodStatDrink(FL.create("potion.diablosauce.strong" , "Old Man Snitches glitched Diablo Sauce" , null , 1, 1000, 999, FluidsGT.SIMPLE, FluidsGT.FOOD, FluidsGT.ACID, FluidsGT.ENCHANTED_EFFECT).setLuminosity(15) , "[Missing No]" , 2, 0.1F , 10, C+50, 0.50F, 0, 0, 99, 10, 0, EnumAction.drink, F, F, F, PotionsGT.ID_FLAMMABLE, 300, 2, 90, Potion.confusion .id,9999, 2, 999, Potion.fireResistance.id,9999, 9, 999, PotionsGT.ID_DEHYDRATION , 400, 4, 100, PotionsGT.ID_INSANITY , 600, 2, 100);
new FoodStatDrink(FL.create("potion.diablosauce.strong" , "There is no Cow Sauce" , null , 1, 1000, 999, FluidsGT.SIMPLE, FluidsGT.FOOD, FluidsGT.ACID, FluidsGT.ENCHANTED_EFFECT).setLuminosity(15) , "[Missing No]" , 2, 0.1F , 10, C+50, 0.50F, 0, 0, 99, 10, 0, EnumAction.drink, F, F, F, PotionsGT.ID_FLAMMABLE, 300, 2, 90, Potion.confusion .id,9999, 2, 999, Potion.fireResistance.id,9999, 9, 999, PotionsGT.ID_DEHYDRATION , 400, 4, 100, PotionsGT.ID_INSANITY , 600, 2, 100);


new FoodStatDrink(FL.create("honey" , "Honey (Biomes o'Plenty, Erebus)" , MT.Honey , 1, 1000, 300) , "Bee careful with it" , 1, 0.1F , 20, C+37, 0.50F, 0, 0, 0, 40, 0, EnumAction.drink, T, F, F, PotionsGT.ID_STICKY, 300, 0, 70).setMilk();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/b/Loader_Worldgen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void run() {
, new StoneLayerOres(MT.TiO2 , F, U64, 0, 12, ST.block(MD.EtFu, "modded_deepslate_ore"),10, BIOMES_DESERT)
, new StoneLayerOres(MT.Au , F, U32, 0, 16, ST.block(MD.EtFu, "deepslate_gold_ore"), BIOMES_MESA)
, new StoneLayerOres(MT.OREMATS.Bauxite , F, U32, 16, 32, ST.block(MD.EtFu, "modded_deepslate_ore"), 0, BIOMES_PLAINS)
, new StoneLayerOres(MT.OREMATS.Magnesite , F, U32, 10, 20, ST.block(MD.EtFu, "modded_deepslate_ore"), 12, BIOMES_DESERT, BIOMES_VOLCANIC)
, new StoneLayerOres(MT.MgCO3 , F, U32, 10, 20, ST.block(MD.EtFu, "modded_deepslate_ore"), 12, BIOMES_DESERT, BIOMES_VOLCANIC)
, new StoneLayerOres(MT.OREMATS.Borax , F, U32, 10, 20, ST.block(MD.EtFu, "modded_deepslate_ore"), 13, BIOMES_OCEAN, BIOMES_RIVER_LAKE)
, new StoneLayerOres(MT.OREMATS.Galena , F, U32, 0, 16, ST.block(MD.EtFu, "modded_deepslate_ore"), 2, BIOMES_MOUNTAINS)
, new StoneLayerOres(MT.Pb , F, U16, 0, 32, ST.block(MD.EtFu, "modded_deepslate_ore"), 3, BIOMES_MOUNTAINS, BIOMES_WOODS)
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/gregtech/loaders/c/Loader_Recipes_Food.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,10 +568,10 @@ public class Loader_Recipes_Food implements Runnable {
RM.Distillery .addRecipe1(F , 16, 16, ST.tag(0), FL.Vodka .make( 2), FL.Vodka .make( 1), ZL_IS);
RM.Distillery .addRecipe1(F , 16, 16, ST.tag(0), FL.Rum_Dark .make( 2), FL.Rum_Dark .make( 1), ZL_IS);
RM.Distillery .addRecipe1(T,T,F,F,F, 16, 80, ST.tag(0), FL.Sap .make( 125), FL.DistW .make(50), OM.dust(MT.Sugar));
RM.Distillery .addRecipe1(T , 16, 128, OM.dust(MT.Chili) , FL.Sauce_Hot .make(750), FL.Sauce_Diabolo .make(750), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Chili) , FL.Sauce_Diabolo.make(750), FL.Sauce_Diablo .make(750), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Gunpowder), FL.Sauce_Diablo .make(250), FL.Sauce_Snitches.make(250), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Gunpowder), FL.Lemonade .make(250), FL.Grenade_Juice .make(250), ZL_IS);
RM.Distillery .addRecipe1(T , 16, 128, OM.dust(MT.Chili) , FL.Sauce_Hot .make(750), FL.Sauce_Diabolo .make(750), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Chili) , FL.Sauce_Diabolo.make(750), FL.Sauce_Diablo .make(750), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Gunpowder), FL.Sauce_Diablo .make(250), FL.Sauce_Cow_Level.make(250), ZL_IS);
RM.Distillery .addRecipe1(T , 64, 128, OM.dust(MT.Gunpowder), FL.Lemonade .make(250), FL.Grenade_Juice .make(250), ZL_IS);

for (FluidStack tWater : FL.waters(1000)) {
RM.Distillery .addRecipe1(T, 16, 48, OM.dust(MT.Coffee) , FL.mul(tWater, 3, 4, T), FL.make("potion.darkcoffee", 750), ZL_IS);
Expand Down

2 comments on commit 63ed237

@laurynasl
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now I am very curious what are these recent events...

@GregoriusT
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the person referenced has done some charity fraud over the last 10 years, hoarding over 600k dollars that were supposed to go to dementia research.

Please sign in to comment.