aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java22
-rw-r--r--src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java45
4 files changed, 57 insertions, 24 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 1ab6b7c6e6..2c09ba1f03 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -51,9 +51,9 @@ public class COMPAT_HANDLER {
to
868
---
- 910
+ 911
to
- 941
+ 940
*/
new RECIPES_LaserEngraver();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
index f087f72265..9e5ccf0dc0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
@@ -21,21 +21,21 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta_MultiBlockBase {
-
+
public static int CASING_TEXTURE_ID;
public static String mCryoFuelName = "Gelid Cryotheum";
public static String mCasingName = "Advanced Crygenic Casing";
-
+
public GregtechMetaTileEntity_IndustrialVacuumFreezer(final int aID, final String aName, final String aNameRegional) {
super(aID, aName, aNameRegional);
- CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10);
+ CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10);
mCryoFuelName = FluidUtils.getFluidStack("cryotheum", 1).getLocalizedName();
mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName();
}
public GregtechMetaTileEntity_IndustrialVacuumFreezer(final String aName) {
super(aName);
- CASING_TEXTURE_ID = TAE.getIndexFromPage(3, 10);
+ CASING_TEXTURE_ID = TAE.getIndexFromPage(2, 10);
mCryoFuelName = FluidUtils.getFluidStack("cryotheum", 1).getLocalizedName();
mCasingName = GregtechItemList.Casing_AdvancedVacuum.get(1).getDisplayName();
}
@@ -63,12 +63,12 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta
public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing,
final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
if (aSide == aFacing) {
- return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[106],
+ return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID],
new GT_RenderedTexture((IIconContainer) (aActive
? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE
- : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER))};
+ : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER))};
}
- return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[106]};
+ return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[CASING_TEXTURE_ID]};
}
public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory,
@@ -106,12 +106,8 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta
if (h != 0 || ((xDir + i != 0 || zDir + j != 0) && (i != 0 || j != 0))) {
final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity
.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
- if (!this.addMaintenanceToMachineList(tTileEntity, CASING_TEXTURE_ID)
- && !this.addInputToMachineList(tTileEntity, CASING_TEXTURE_ID)
- && !this.addOutputToMachineList(tTileEntity, CASING_TEXTURE_ID)
- && !this.addEnergyInputToMachineList(tTileEntity, CASING_TEXTURE_ID)) {
- if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h,
- zDir + j) != ModBlocks.blockCasings3Misc) {
+ if (!this.addToMachineList(tTileEntity, CASING_TEXTURE_ID)) {
+ if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasings3Misc) {
return false;
}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 10) {
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
index 8e632b8e6b..603789bd23 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/item/TF_Items.java
@@ -3,12 +3,15 @@ package gtPlusPlus.xmod.thermalfoundation.item;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
+import gregtech.api.enums.GT_Values;
+
import cofh.core.item.ItemBase;
import cofh.core.item.ItemBucket;
import cofh.core.util.energy.FurnaceFuelHandler;
import cofh.core.util.fluid.BucketHandler;
import cofh.lib.util.helpers.ItemHelper;
import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
import gtPlusPlus.xmod.thermalfoundation.block.TF_Blocks;
@@ -74,14 +77,11 @@ public class TF_Items {
}
public static void postInit(){
-
+ if (!CORE.GTNH) {
ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustPyrotheum, 1), new Object[] { "dustCoal", "dustSulfur", "dustRedstone", "dustBlaze" }));
ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustCryotheum, 1), new Object[] { Items.snowball, "dustSaltpeter", "dustRedstone", "dustBlizz" }));
ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustCryotheum, 1), new Object[] { Items.snowball, "dustNitor", "dustRedstone", "dustBlizz" }));
- //ItemHelper.addRecipe(ItemHelper.ShapelessRecipe(ItemHelper.cloneStack(dustBlizz, 2), new Object[] { "rodBlizz" }));
-
-
-
+ }
}
}
diff --git a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
index 8c46ccd872..fc5db6f70a 100644
--- a/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
+++ b/src/Java/gtPlusPlus/xmod/thermalfoundation/recipe/TF_Gregtech_Recipes.java
@@ -9,6 +9,7 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
+import cofh.lib.util.helpers.ItemHelper;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
@@ -28,16 +29,16 @@ public class TF_Gregtech_Recipes {
final ItemStack dust_Blizz = TF_Items.itemDustBlizz.copy();
final ItemStack dust_Blizz3 = ItemUtils.simpleMetaStack(TF_Items.itemMaterial, 2, 3);
final ItemStack rod_Blizz = TF_Items.itemRodBlizz.copy();
- final FluidStack moltenRedstone = getFluidStack("molten.redstone", 250);
+ final FluidStack moltenBlaze = getFluidStack("molten.blaze", 1440);
//Gelid Cryotheum
Logger.INFO("Adding Recipes for Gelid Cryotheum");
- GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 250), 10000, 200, 240);
- GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 200), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L), GT_Values.NI, GT_Values.NI, null, 400, 30);
+ GT_Values.RA.addFluidExtractionRecipe(dust_Cryotheum, GT_Values.NI, getFluidStack("cryotheum", 144), 10000, 200, 240);
+ GT_Values.RA.addChemicalBathRecipe((GT_OreDictUnificator.get(OrePrefixes.ore, Materials.Cinnabar, 1L)), getFluidStack("cryotheum", 144), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cinnabar, 3L), GT_Values.NI, GT_Values.NI, null, 400, 30);
//Blizz Powder
Logger.INFO("Adding Recipes for Blizz Powder");
- GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 4), moltenRedstone, dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 240);
+ GT_Values.RA.addChemicalBathRecipe(new ItemStack(Items.snowball, 4), moltenBlaze, dust_Blizz, GT_Values.NI, GT_Values.NI, null, 400, 240);
//Blizz Rod
Logger.INFO("Adding Recipes for Blizz Rod");
@@ -47,6 +48,42 @@ public class TF_Gregtech_Recipes {
//Blazing Pyrotheum
Logger.INFO("Adding Recipes for Blazing Pyrotheum");
GT_Values.RA.addFluidExtractionRecipe(dust_Pyrotheum, GT_Values.NI, getFluidStack("pyrotheum", 250), 10000, 200, 240);
+
+
+
+ GT_Values.RA.addMixerRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCoal", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRedstone", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBlaze", 1), //Input
+ null, //F in
+ null, //F out
+ ItemHelper.cloneStack(dust_Pyrotheum, 1), //Output
+ 20*8,
+ 120);
+
+ GT_Values.RA.addMixerRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSaltpeter", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSnow", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRedstone", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1), //Input
+ null, //F in
+ null, //F out
+ ItemHelper.cloneStack(dust_Cryotheum, 1), //Output
+ 20*8,
+ 120);
+
+ GT_Values.RA.addMixerRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustNitor", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSnow", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustRedstone", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustBlizz", 1), //Input
+ null, //F in
+ null, //F out
+ ItemHelper.cloneStack(dust_Cryotheum, 1), //Output
+ 20*8,
+ 120);
+
}
generated by cgit (git 2.46.0) at 2025-03-10 14:00:17 +0000