aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorDimach <Dimach@users.noreply.github.com>2018-12-09 18:39:06 +0300
committerDream-MasterXXL <dream-master@gmx.net>2018-12-11 10:20:12 +0100
commit36f45528f2025e9e7f52fc806626034c45e3712d (patch)
tree78f25bd52bdbab76497bf1982fc08ead3ed4946c /src/main/java/gregtech/loaders
parent7d326102203de761d8a2d4a47642d86268461286 (diff)
downloadGT5-Unofficial-36f45528f2025e9e7f52fc806626034c45e3712d.tar.gz
GT5-Unofficial-36f45528f2025e9e7f52fc806626034c45e3712d.tar.bz2
GT5-Unofficial-36f45528f2025e9e7f52fc806626034c45e3712d.zip
cherry pick 0beea9037cd8ff7a899c14c53d6b9a381c22f42c
Add volumetric flask. (#1500)
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java3
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
index d172e95115..7946381981 100644
--- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java
@@ -12,6 +12,8 @@ import ic2.core.Ic2Items;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
public class GT_CraftingRecipeLoader implements Runnable {
private final static String aTextIron1 = "X X";
@@ -839,5 +841,6 @@ public class GT_CraftingRecipeLoader implements Runnable {
}
GT_ModHandler.addShapelessCraftingRecipe(Materials.Fireclay.getDust(2), new Object[]{Materials.Brick.getDust(1), Materials.Clay.getDust(1)});
+ GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ball.get(0), new FluidStack(FluidRegistry.getFluid("molten.borosilicateglass"), 144), ItemList.VOLUMETRIC_FLASK.get(1), 44, 24);
}
}
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 2023253eec..28968ef537 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
@@ -83,6 +83,8 @@ public class GT_Loader_Item_Block_And_Fluid
ItemList.Rotor_EV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L));
ItemList.Rotor_IV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L));
+ ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000));
+
Item tItem = (Item) GT_Utility.callConstructor("gregtech.common.items.GT_SensorCard_Item", 0, null, false, new Object[]{"sensorcard", "GregTech Sensor Card"});
ItemList.NC_SensorCard.set(tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed", false) : tItem);