aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java51
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java22
-rw-r--r--src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java25
3 files changed, 80 insertions, 18 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 781f2f588b..1461affb4a 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -159,10 +159,19 @@ public final class ModItems {
public static Item shardTerra;
public static Item shardAqua;
+ //Tc Compat for energy crystal recipes
public static BaseItemTCShard shardDull;
-
+
+ //Lighter
public static Item itemBasicFireMaker;
+ //Zirconium
+ public static Item itemZirconiumChlorideCinterPellet;
+ public static Item dustZrCl4;
+ public static Item dustCookedZrCl4;
+ public static Item dustZrF4;
+
+
//@SuppressWarnings("unused")
@SuppressWarnings("unused")
@@ -354,7 +363,19 @@ public final class ModItems {
FluidUtils.generateFluid("BerylliumFluoride", "Beryllium Fluoride", 3200, new short[]{175, 175, 175, 100});
FluidUtils.generateFluid("LithiumFluoride", "Lithium Fluoride", 2000, new short[]{235, 235, 235, 100});
FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
+
+ //Zirconium
+ //Cinter Pellet.
+ itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", tabMisc).setTextureName(CORE.MODID + ":itemShard");
+ GT_OreDictUnificator.registerOre("pelletZirconium", new ItemStack(itemZirconiumChlorideCinterPellet));
+ //Zirconium Chloride
+ dustZrCl4 = ItemUtils.generateSpecialUseDusts("ZrCl4", "ZrCl4 Dust", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+ dustCookedZrCl4 = ItemUtils.generateSpecialUseDusts("CookedZrCl4", "Cooked ZrCl4 Compound", Utils.rgbtoHexValue(180, 180, 180))[0]; //http://www.iaea.org/inis/collection/NCLCollectionStore/_Public/39/036/39036750.pdf
+ //Zirconium Tetrafluoride
+ dustZrF4 = ItemUtils.generateSpecialUseDusts("ZrF4", "ZrF4 Dust", Utils.rgbtoHexValue(170, 170, 170))[0]; //https://en.wikipedia.org/wiki/Zirconium_tetrafluoride
+
+ //Test items
metaItem2 = new BaseEuItem();
metaItem2.registerItem(0, EnumChatFormatting.BLACK+"Test Item 0", 0, 0, "I am 0.");
metaItem2.registerItem(1, EnumChatFormatting.GREEN+"Test Item 1", 1006346000, 1, "I Hold EU 1.", 500);
@@ -364,15 +385,15 @@ public final class ModItems {
metaItem2.registerItem(5, "Whirlygig 2", 2124867000, (short) 7, "Spin me right round.", EnumRarity.uncommon, EnumChatFormatting.RED, true);
boolean gtStyleTools = LoadedMods.Gregtech;
-
+
if (CORE.configSwitches.enableMultiSizeTools){
- Materials[] rm = Materials.values();
- for (Materials m : rm){
- MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m);
- MS_GTMATERIAL = ItemUtils.generateMultiShovel(gtStyleTools, m);
- /*itemBaseDecidust = UtilsItems.generateDecidust(m);
+ Materials[] rm = Materials.values();
+ for (Materials m : rm){
+ MP_GTMATERIAL = ItemUtils.generateMultiPick(gtStyleTools, m);
+ MS_GTMATERIAL = ItemUtils.generateMultiShovel(gtStyleTools, m);
+ /*itemBaseDecidust = UtilsItems.generateDecidust(m);
itemBaseCentidust = UtilsItems.generateCentidust(m);*/
- }
+ }
}
//EnderIO Resources
@@ -405,7 +426,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("EnderIO not Found - Skipping Resources.");
}
-
+
//Big Reactors
if (LoadedMods.Big_Reactors|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("BigReactors Found - Loading Resources.");
@@ -418,7 +439,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("BigReactors not Found - Skipping Resources.");
}
-
+
//Thaumcraft
if (LoadedMods.Thaumcraft|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("Thaumcraft Found - Loading Resources.");
@@ -436,7 +457,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("Thaumcraft not Found - Skipping Resources.");
}
-
+
//ExtraUtils
if (LoadedMods.Extra_Utils|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("ExtraUtilities Found - Loading Resources.");
@@ -449,7 +470,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("ExtraUtilities not Found - Skipping Resources.");
}
-
+
//Pneumaticraft
if (LoadedMods.PneumaticCraft|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("PneumaticCraft Found - Loading Resources.");
@@ -459,7 +480,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("PneumaticCraft not Found - Skipping Resources.");
}
-
+
//Simply Jetpacks
if (LoadedMods.Simply_Jetpacks|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("SimplyJetpacks Found - Loading Resources.");
@@ -471,7 +492,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("SimplyJetpacks not Found - Skipping Resources.");
}
-
+
//rfTools
if (LoadedMods.RFTools|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("rfTools Found - Loading Resources.");
@@ -481,7 +502,7 @@ public final class ModItems {
else {
Utils.LOG_WARNING("rfTools not Found - Skipping Resources.");
}
-
+
//IC2 Exp
if (LoadedMods.IndustrialCraft2|| LOAD_ALL_CONTENT){
Utils.LOG_INFO("IndustrialCraft2 Found - Loading Resources.");
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 4133c10baf..bc985749ea 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -246,6 +246,26 @@ public class RECIPES_GREGTECH {
1000); //EU
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+
+ //Zirconium Chloride -> TetraFluoride
+ try {
+
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9),
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 36)
+ }, //Item input (Array, up to 2)
+ FluidUtils.getFluidStack("hydrofluoricacid", 9*144), //Fluid input (slot 1)
+ null, //Fluid output (slot 2)
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 36),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9)
+ }, //Output Array of Items - Upto 9,
+ new int[]{0},
+ 120*20, //Time in ticks
+ 500); //EU
+
+ }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
}
@@ -257,7 +277,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("molten.li2bef4", 1000), //Fluid output (slot 2)
FluidUtils.getFluidStack("molten.uranium233", 500), //Output Array of Items - Upto 9,
16000*20, //Time in ticks
- 8000); //EU
+ 4000); //EU
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
diff --git a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
index 65c0e87fd9..381aa81fb4 100644
--- a/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
+++ b/src/Java/gtPlusPlus/core/util/fluid/FluidUtils.java
@@ -35,6 +35,16 @@ public class FluidUtils {
return null;
}
}
+
+ public static FluidStack getFluidStack(Fluid vFluid, int fluidAmount) {
+ Utils.LOG_WARNING("Trying to get a fluid stack of "+vFluid.getName());
+ try {
+ return FluidRegistry.getFluidStack(vFluid.getName(), fluidAmount).copy();
+ }
+ catch (Throwable e){
+ return null;
+ }
+ }
public static FluidStack[] getFluidStackArray(String fluidName, int amount){
Utils.LOG_WARNING("Trying to get a fluid stack of "+fluidName);
@@ -340,7 +350,7 @@ public class FluidUtils {
}
public final static Fluid generateFluid(String unlocalizedName, String localizedName, int MeltingPoint, short[] RGBA){
- if (FluidUtils.getFluidStack("molten"+localizedName, 1) == null){
+ if (FluidUtils.getFluidStack("molten"+localizedName, 1) == null && ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1) != null){
Utils.LOG_WARNING("Generating our own fluid.");
//Generate a Cell if we need to
@@ -348,7 +358,8 @@ public class FluidUtils {
@SuppressWarnings("unused")
Item temp = new BaseItemComponent(unlocalizedName, localizedName, RGBA);
}
- return FluidUtils.addGTFluid(
+
+ Fluid gtFluid = FluidUtils.addGTFluid(
unlocalizedName,
"Molten "+localizedName,
RGBA,
@@ -357,6 +368,16 @@ public class FluidUtils {
ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+unlocalizedName, 1),
ItemList.Cell_Empty.get(1L, new Object[0]),
1000);
+
+ GT_Values.RA.addFluidExtractionRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+Utils.sanitizeString(localizedName), 1), //Input
+ null, //Input 2
+ FluidUtils.getFluidStack(gtFluid, 144), //Fluid Output
+ 0, //Chance
+ 1*20, //Duration
+ 16 //Eu Tick
+ );
+ return gtFluid;
}
return null;
}
generated by cgit (git 2.46.0) at 2025-03-10 17:06:02 +0000