diff options
Diffstat (limited to 'src/main/java/gregtech')
6 files changed, 56 insertions, 56 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 364031d6ca..34df98fc55 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -226,11 +226,11 @@ public enum ItemList implements IItemContainer { Large_Fluid_Cell_Osmium, Large_Fluid_Cell_Neutronium, ThermosCan_Empty, - ThermosCan_Dark_Coffee, - ThermosCan_Dark_Cafe_au_lait, ThermosCan_Coffee, - ThermosCan_Cafe_au_lait, - ThermosCan_Lait_au_cafe, + ThermosCan_Sweet_Coffee, + ThermosCan_Latte, + ThermosCan_Sweet_Latte, + ThermosCan_Sweet_Jesus_Latte, ThermosCan_Dark_Chocolate_Milk, ThermosCan_Chocolate_Milk, ThermosCan_Tea, diff --git a/src/main/java/gregtech/common/items/IDMetaItem02.java b/src/main/java/gregtech/common/items/IDMetaItem02.java index a67e22545c..5766feec23 100644 --- a/src/main/java/gregtech/common/items/IDMetaItem02.java +++ b/src/main/java/gregtech/common/items/IDMetaItem02.java @@ -3,11 +3,11 @@ package gregtech.common.items; public enum IDMetaItem02 { // Please pretty please, add your entries while conserving the order - ThermosCan_Dark_Coffee(0), - ThermosCan_Dark_Cafe_au_lait(1), - ThermosCan_Coffee(2), - ThermosCan_Cafe_au_lait(3), - ThermosCan_Lait_au_cafe(4), + ThermosCan_Coffee(0), + ThermosCan_Sweet_Coffee(1), + ThermosCan_Latte(2), + ThermosCan_Sweet_Latte(3), + ThermosCan_Sweet_Jesus_Latte(4), ThermosCan_Dark_Chocolate_Milk(5), ThermosCan_Chocolate_Milk(6), ThermosCan_Tea(7), diff --git a/src/main/java/gregtech/common/items/MetaGeneratedItem02.java b/src/main/java/gregtech/common/items/MetaGeneratedItem02.java index 45404e36cd..6cc3feb6bc 100644 --- a/src/main/java/gregtech/common/items/MetaGeneratedItem02.java +++ b/src/main/java/gregtech/common/items/MetaGeneratedItem02.java @@ -202,14 +202,14 @@ import static gregtech.common.items.IDMetaItem02.Plank_Walnut; import static gregtech.common.items.IDMetaItem02.Plank_Wenge; import static gregtech.common.items.IDMetaItem02.Plank_Willow; import static gregtech.common.items.IDMetaItem02.SFMixture; -import static gregtech.common.items.IDMetaItem02.ThermosCan_Cafe_au_lait; import static gregtech.common.items.IDMetaItem02.ThermosCan_Chocolate_Milk; import static gregtech.common.items.IDMetaItem02.ThermosCan_Coffee; -import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Cafe_au_lait; import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Chocolate_Milk; -import static gregtech.common.items.IDMetaItem02.ThermosCan_Dark_Coffee; import static gregtech.common.items.IDMetaItem02.ThermosCan_Ice_Tea; -import static gregtech.common.items.IDMetaItem02.ThermosCan_Lait_au_cafe; +import static gregtech.common.items.IDMetaItem02.ThermosCan_Latte; +import static gregtech.common.items.IDMetaItem02.ThermosCan_Sweet_Coffee; +import static gregtech.common.items.IDMetaItem02.ThermosCan_Sweet_Jesus_Latte; +import static gregtech.common.items.IDMetaItem02.ThermosCan_Sweet_Latte; import static gregtech.common.items.IDMetaItem02.ThermosCan_Sweet_Tea; import static gregtech.common.items.IDMetaItem02.ThermosCan_Tea; @@ -295,10 +295,10 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 { OrePrefixes.gearGt); INSTANCE = this; - ItemList.ThermosCan_Dark_Coffee.set( + ItemList.ThermosCan_Coffee.set( addItem( - ThermosCan_Dark_Coffee.ID, - "Dark Coffee", + ThermosCan_Coffee.ID, + "Coffee", "Coffee, dark, without anything else", new GTFoodStat( 2, @@ -320,10 +320,10 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 { new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L), new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L))); - ItemList.ThermosCan_Dark_Cafe_au_lait.set( + ItemList.ThermosCan_Sweet_Coffee.set( addItem( - ThermosCan_Dark_Cafe_au_lait.ID, - "Dark Coffee au lait", + ThermosCan_Sweet_Coffee.ID, + "Sweet coffee", "Keeping you awake the whole night", new GTFoodStat( 2, @@ -345,11 +345,11 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 { new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L), new TCAspects.TC_AspectStack(TCAspects.MOTUS, 3L))); - ItemList.ThermosCan_Coffee.set( + ItemList.ThermosCan_Latte.set( addItem( - ThermosCan_Coffee.ID, - "Coffee", - "Just the regular morning Coffee", + ThermosCan_Latte.ID, + "Latte", + "Just the regular morning Coffee, with milk", new GTFoodStat( 3, 0.4F, @@ -370,11 +370,11 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 { new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L), new TCAspects.TC_AspectStack(TCAspects.MOTUS, 1L))); - ItemList.ThermosCan_Cafe_au_lait.set( + ItemList.ThermosCan_Sweet_Latte.set( addItem( - ThermosCan_Cafe_au_lait.ID, - "Cafe au lait", - "Sweet Coffee", + ThermosCan_Sweet_Latte.ID, + "Sweet Latte", + "A little bit of sugar goes a long way", new GTFoodStat( 3, 0.4F, @@ -395,11 +395,11 @@ public class MetaGeneratedItem02 extends MetaGeneratedItemX32 { new TCAspects.TC_AspectStack(TCAspects.GELUM, 1L), new TCAspects.TC_AspectStack(TCAspects.AQUA, 1L), new TCAspects.TC_AspectStack(TCAspects.MOTUS, 2L))); - ItemList.ThermosCan_Lait_au_cafe.set( + ItemList.ThermosCan_Sweet_Jesus_Latte.set( addItem( - ThermosCan_Lait_au_cafe.ID, - "Lait au cafe", - "You want Coffee to your Sugar?", + ThermosCan_Sweet_Jesus_Latte.ID, + "Sweet Jesus Latte", + "You want some Coffee to your Sugar?", new GTFoodStat( 3, 0.4F, diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 8e4fb0bc58..178034b176 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -296,7 +296,7 @@ public class BreweryRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) .fluidInputs(new FluidStack(tFluid, 750)) - .fluidOutputs(getFluidStack("potion.darkcoffee", 750)) + .fluidOutputs(getFluidStack("potion.coffee", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(brewingRecipes); @@ -341,7 +341,7 @@ public class BreweryRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) .fluidInputs(getFluidStack("milk", 750)) - .fluidOutputs(getFluidStack("potion.coffee", 750)) + .fluidOutputs(getFluidStack("potion.latte", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(brewingRecipes); @@ -380,16 +380,16 @@ public class BreweryRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .fluidInputs(getFluidStack("potion.coffee", 750)) - .fluidOutputs(getFluidStack("potion.cafeaulait", 750)) + .fluidInputs(getFluidStack("potion.latte", 750)) + .fluidOutputs(getFluidStack("potion.sweetlatte", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(brewingRecipes); GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .fluidInputs(getFluidStack("potion.cafeaulait", 750)) - .fluidOutputs(getFluidStack("potion.laitaucafe", 750)) + .fluidInputs(getFluidStack("potion.sweetlatte", 750)) + .fluidOutputs(getFluidStack("potion.sweetjesuslatte", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(brewingRecipes); @@ -404,8 +404,8 @@ public class BreweryRecipes implements Runnable { GTValues.RA.stdBuilder() .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) - .fluidInputs(getFluidStack("potion.darkcoffee", 750)) - .fluidOutputs(getFluidStack("potion.darkcafeaulait", 750)) + .fluidInputs(getFluidStack("potion.coffee", 750)) + .fluidOutputs(getFluidStack("potion.sweetcoffee", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) .addTo(brewingRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java index de86455665..17df7fea61 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java @@ -446,7 +446,7 @@ public class MixerRecipes implements Runnable { GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1)) .itemOutputs(ItemList.Food_Chum.get(4)) .fluidInputs(getFluidStack("potion.purpledrink", 750)) - .fluidOutputs(getFluidStack("sludge", 1000)) + .fluidOutputs(getFluidStack("Sludge", 1000)) .duration(6 * SECONDS + 8 * TICKS) .eut(24) .addTo(mixerRecipes); diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index c3bf4d5031..42110f68f1 100644 --- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -1927,33 +1927,33 @@ public class LoaderGTBlockFluid implements Runnable { .buildAndRegister() .registerPContainers(ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GTFluidFactory.builder("potion.darkcoffee") - .withLocalizedName("Dark Coffee") + GTFluidFactory.builder("potion.coffee") + .withLocalizedName("Coffee") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GTFluidFactory.builder("potion.darkcafeaulait") - .withLocalizedName("Dark Cafe au lait") + .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GTFluidFactory.builder("potion.sweetcoffee") + .withLocalizedName("Sweet Coffee") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GTFluidFactory.builder("potion.coffee") - .withLocalizedName("Coffee") + .registerPContainers(ItemList.ThermosCan_Sweet_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GTFluidFactory.builder("potion.Latte") + .withLocalizedName("Latte") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GTFluidFactory.builder("potion.cafeaulait") - .withLocalizedName("Cafe au lait") + .registerPContainers(ItemList.ThermosCan_Latte.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GTFluidFactory.builder("potion.sweetlatte") + .withLocalizedName("Sweet Latte") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GTFluidFactory.builder("potion.laitaucafe") - .withLocalizedName("Lait au cafe") + .registerPContainers(ItemList.ThermosCan_Sweet_Latte.get(1L), ItemList.ThermosCan_Empty.get(1L)); + GTFluidFactory.builder("potion.sweetjesuslatte") + .withLocalizedName("Sweet Jesus Latte") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() - .registerPContainers(ItemList.ThermosCan_Lait_au_cafe.get(1L), ItemList.ThermosCan_Empty.get(1L)); + .registerPContainers(ItemList.ThermosCan_Sweet_Jesus_Latte.get(1L), ItemList.ThermosCan_Empty.get(1L)); GTFluidFactory.builder("potion.darkchocolatemilk") - .withLocalizedName("Bitter Chocolate Milk") + .withLocalizedName("Dark Chocolate Milk") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); |