aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <Draknyte1@hotmail.com>2020-05-26 19:28:03 +0100
committerAlkalus <Draknyte1@hotmail.com>2020-05-26 19:28:03 +0100
commit0b64ce224c2e3dc93d13d968a9094ebcb4903de6 (patch)
tree891fdba2cd8bf035ef3636a53d4bc6da996a2147 /src/Java/gtPlusPlus/core
parent92b8261907b3800d4468c1dc546eccc4e158c224 (diff)
downloadGT5-Unofficial-0b64ce224c2e3dc93d13d968a9094ebcb4903de6.tar.gz
GT5-Unofficial-0b64ce224c2e3dc93d13d968a9094ebcb4903de6.tar.bz2
GT5-Unofficial-0b64ce224c2e3dc93d13d968a9094ebcb4903de6.zip
+ Added new Volumetric Flasks.
% Updated GT to reflect required change for additional Volumetric Flasks.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 1303ba2ab6..bc9cb4bc5e 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -4,8 +4,10 @@ import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
import static gtPlusPlus.core.lib.CORE.LOAD_ALL_CONTENT;
import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.common.items.GT_VolumetricFlask;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
import gtPlusPlus.core.block.base.BlockBaseModular;
@@ -100,6 +102,9 @@ import gtPlusPlus.everglades.GTplusplus_Everglades;
import gtPlusPlus.preloader.CORE_Preloader;
import gtPlusPlus.xmod.cofh.HANDLER_COFH;
import gtPlusPlus.xmod.eio.material.MaterialEIO;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
+import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
@@ -976,8 +981,12 @@ public final class ModItems {
itemIonParticleBase = new IonParticles();
itemStandarParticleBase = new StandardBaseParticles();
-
-
+ if (Meta_GT_Proxy.sDoesVolumetricFlaskExist) {
+ Item a8kFlask = VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_8k", "Large Volumetric Flask", 8000);
+ Item a64kFlask = VolumetricFlaskHelper.generateNewFlask("Volumetric_Flask_64k", "Gigantic Volumetric Flask", 64000);
+ GregtechItemList.VOLUMETRIC_FLASK_8k.set(a8kFlask);
+ GregtechItemList.VOLUMETRIC_FLASK_64k.set(a64kFlask);
+ }
itemBoilerChassis = new ItemBoilerChassis();
itemDehydratorCoilWire = new ItemDehydratorCoilWire();