diff options
| author | Technus <daniel112092@gmail.com> | 2016-11-30 11:42:23 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-11-30 11:42:23 +0100 |
| commit | 392c3a3a7e488119c783b12d68030959fe509d24 (patch) | |
| tree | 6a94199c507b93af029dd7f8f6da154f3be802e1 /src/main | |
| parent | dc765d0ff85b245dfb5ff8e0b7427bc1e242ed80 (diff) | |
| download | GT5-Unofficial-392c3a3a7e488119c783b12d68030959fe509d24.tar.gz GT5-Unofficial-392c3a3a7e488119c783b12d68030959fe509d24.tar.bz2 GT5-Unofficial-392c3a3a7e488119c783b12d68030959fe509d24.zip | |
ducttape fix glue
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java | 2 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png) | bin | 6278 -> 6278 bytes | |||
| -rw-r--r-- | src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png.mcmeta (renamed from src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png.mcmeta) | 0 |
4 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index c79736d529..651e48b6a5 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -606,6 +606,11 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), Materials.OilMedium.getFluid(200L), Materials.Oil.getFluid(100L), 16, 24, false); GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), Materials.OilHeavy.getFluid(100L), Materials.Oil.getFluid(100L), 16, 24, false); + if(Loader.isModLoaded("TConstruct")) { + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), Materials.Glue.getFluid(8L), FluidRegistry.getFluidStack("glue", 8), 1, 24, false); + GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), FluidRegistry.getFluidStack("glue", 8), Materials.Glue.getFluid(8L), 1, 24, false); + } + GT_Values.RA.addFluidHeaterRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), Materials.Water.getFluid(6L), Materials.Water.getGas(960L), 30, 32); GT_Values.RA.addFluidHeaterRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), GT_ModHandler.getDistilledWater(6L), Materials.Water.getGas(960L), 30, 32); GT_Values.RA.addFluidHeaterRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L, new Object[0]), Materials.SeedOil.getFluid(16L), Materials.FryingOilHot.getFluid(16L), 16, 32); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index 6e082863a2..3fa66089b9 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -453,7 +453,7 @@ public class GT_Loader_Item_Block_And_Fluid GT_Mod.gregtechproxy.addFluid("sulfuricacid", "Sulfuric Acid", Materials.SulfuricAcid, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("milk", "Milk", Materials.Milk, 1, 290, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("mcguffium", "Mc Guffium 239", Materials.McGuffium239, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - GT_Mod.gregtechproxy.addFluid("glue", "Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + GT_Mod.gregtechproxy.addFluid("refinedGlue", " Refined Glue", Materials.Glue, 1, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("hotfryingoil", "Hot Frying Oil", Materials.FryingOilHot, 1, 400, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); GT_Mod.gregtechproxy.addFluid("fieryblood", "Fiery Blood", Materials.FierySteel, 1, 6400, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png Binary files differindex 93c937e777..93c937e777 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png.mcmeta index 0df7234a79..0df7234a79 100644 --- a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.glue.png.mcmeta +++ b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.refinedglue.png.mcmeta |
