aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java32
3 files changed, 25 insertions, 25 deletions
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));