aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java26
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java3
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.pngbin0 -> 1013 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.window.pngbin0 -> 399 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.pngbin0 -> 1010 bytes
-rw-r--r--src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.pngbin0 -> 398 bytes
8 files changed, 40 insertions, 6 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();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 9c22258e45..7d3476d48b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -94,6 +94,10 @@ public enum GregtechItemList implements GregtechItemContainer {
//Debug
TESTITEM,
+
+ // Larger Volumetric Flasks
+ VOLUMETRIC_FLASK_8k,
+ VOLUMETRIC_FLASK_64k,
//RTG Fuels
Pellet_RTG_PU238, Pellet_RTG_SR90,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
index 76bb378377..a169419fea 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/VolumetricFlaskHelper.java
@@ -1,9 +1,11 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
+import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -25,12 +27,22 @@ public class VolumetricFlaskHelper {
sMethodGetFlaskMaxCapacity = null;
}
}
-
+
public static ItemStack getVolumetricFlask(int aAmount) {
ItemStack aFlask = ItemUtils.getValueOfItemList("VOLUMETRIC_FLASK", aAmount, (ItemStack) null);
return aFlask;
}
+ public static ItemStack getLargeVolumetricFlask(int aAmount) {
+ ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_8k.get(aAmount);
+ return aFlask;
+ }
+
+ public static ItemStack getGiganticVolumetricFlask(int aAmount) {
+ ItemStack aFlask = GregtechItemList.VOLUMETRIC_FLASK_64k.get(aAmount);
+ return aFlask;
+ }
+
public static boolean isVolumetricFlask(ItemStack aStack) {
if (mFlask == null) {
ItemStack aFlask = ItemUtils.getValueOfItemList("VOLUMETRIC_FLASK", 1, (ItemStack) null);
@@ -77,5 +89,17 @@ public class VolumetricFlaskHelper {
nbt.setInteger("Capacity", aCapacity);
return true;
}
+
+ public static Item generateNewFlask(String unlocalized, String english, int maxCapacity) {
+ Constructor aFlask = ReflectionUtils.getConstructor(sClassVolumetricFlask, new Class[] {String.class, String.class, int.class});
+ if (aFlask != null) {
+ Object aInstance = ReflectionUtils.createNewInstanceFromConstructor(aFlask, new Object[] {unlocalized, english, maxCapacity});
+ if (aInstance != null && aInstance instanceof Item) {
+ Item aNewFlaskItem = (Item) aInstance;
+ return aNewFlaskItem;
+ }
+ }
+ return null;
+ }
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index 7fd89c481a..0883647c3d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -749,7 +749,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase {
markDirty();
}
}
- Logger.INFO("SolidCasingTier: "+mSolidCasingTier);
super.onPostTick(aBaseMetaTileEntity, aTick);
}
@@ -1046,11 +1045,9 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase {
for (int aTier : mTieredBlockRegistry.keySet()) {
Triplet<Block, Integer, Integer> aData = mTieredBlockRegistry.get(aTier);
if (aData.getValue_1() == aInitStructureCheck && aData.getValue_2() == aInitStructureCheckMeta) {
- Logger.INFO("Found Tier information for "+aTier);
return aTier;
}
}
- Logger.INFO("Could not find tier info for "+aInitStructureCheck.getLocalizedName()+"|"+aInitStructureCheckMeta);
return 0;
}
catch (Throwable t) {
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.png
new file mode 100644
index 0000000000..13b37c999d
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.window.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.window.png
new file mode 100644
index 0000000000..3fd5382926
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_64k.window.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png
new file mode 100644
index 0000000000..ffd9d4893b
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.png
Binary files differ
diff --git a/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png
new file mode 100644
index 0000000000..a08018f561
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/items/gt.Volumetric_Flask_8k.window.png
Binary files differ
generated by cgit (git 2.46.0) at 2025-03-09 16:59:14 +0000