aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java5
-rw-r--r--src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java11
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java17
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java3
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java24
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java34
8 files changed, 72 insertions, 26 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index a874177520..f6c949df13 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -18,7 +18,6 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc;
import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
import gtPlusPlus.core.item.base.plates.BaseItemPlate;
import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble;
-import gtPlusPlus.core.item.effects.RarityRare;
import gtPlusPlus.core.item.effects.RarityUncommon;
import gtPlusPlus.core.item.general.*;
import gtPlusPlus.core.item.init.ItemsFoods;
@@ -31,7 +30,6 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.*;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
-import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.debug.DEBUG_INIT;
import gtPlusPlus.core.util.fluid.FluidUtils;
@@ -371,7 +369,8 @@ public final class ModItems {
MaterialGenerator.generate(ALLOY.INCONEL_792);
- //Maraging Steel
+ //Steels
+ MaterialGenerator.generate(ALLOY.EGLIN_STEEL);
MaterialGenerator.generate(ALLOY.MARAGING250);
MaterialGenerator.generate(ALLOY.MARAGING300);
MaterialGenerator.generate(ALLOY.MARAGING350);
diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
index f28f2871a8..eb86f995d3 100644
--- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java
@@ -264,14 +264,21 @@ public class BaseItemDust extends Item{
Utils.LOG_INFO("Found "+input2.getDisplayName());
}
}*/
+
+ int timeTaken = 250*this.mTier*20;
+
+ if (this.mTier <= 4){
+ timeTaken = 50*this.mTier*20;
+ }
+
GT_Values.RA.addBlastRecipe(
input1,
input2,
GT_Values.NF, GT_Values.NF,
output1,
output2,
- 250*this.mTier*20,
- this.mTier*64,
+ timeTaken,
+ this.mTier*60,
tempRequired);
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index 550a23b4c5..027cacbc29 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -522,7 +522,22 @@ public final class ALLOY {
new MaterialStack(ELEMENT.getInstance().HYDROGEN, 10)
}); //Material Stacks with Percentage of required elements.
-
+ public static final Material EGLIN_STEEL = new Material(
+ "Eglin Steel", //Material Name
+ MaterialState.SOLID, //State
+ new short[]{139,69,19, 0}, //Material Colour
+ 1048, //Melting Point in C
+ 1973, //Boiling Point in C
+ ((ALLOY.STEEL.getProtons()*20)+(ELEMENT.getInstance().NICKEL.getProtons()*5)+(ELEMENT.getInstance().SILICON.getProtons()*1)+(ELEMENT.getInstance().ALUMINIUM.getProtons()*4))/30, //Protons
+ ((ALLOY.STEEL.getNeutrons()*20)+(ELEMENT.getInstance().NICKEL.getNeutrons()*5)+(ELEMENT.getInstance().SILICON.getNeutrons()*1)+(ELEMENT.getInstance().ALUMINIUM.getNeutrons()*4))/30, //Neutrons
+ true, //Uses Blast furnace?
+ //Material Stacks with Percentage of required elements.
+ new MaterialStack[]{
+ new MaterialStack(ALLOY.STEEL, 20),
+ new MaterialStack(ELEMENT.getInstance().SILICON, 1),
+ new MaterialStack(ELEMENT.getInstance().NICKEL, 5),
+ new MaterialStack(ELEMENT.getInstance().ALUMINIUM, 4),
+ });
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 617850105b..dc23420add 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -532,7 +532,8 @@ public class RECIPES_GREGTECH {
GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 1), null, null, null, FluidUtils.getFluidStack("oxygen", 288), FluidUtils.getFluidStack("sulfurdioxide", 432), null, 600, 60);
GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustUranium233", 4), ItemUtils.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 144*3), null, 3000, 500);
//GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 720), FluidUtils.getFluidStack("molten.uraniumhexafluoride", 288), null, 5000, 2000);
- }
+ GT_Values.RA.addMixerRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 20), ItemUtils.getItemStackOfAmountFromOreDict("dustSilicon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustNickel", 5), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), null, null, ItemUtils.getItemStackOfAmountFromOreDict("dustEglinSteel", 30), 1200, 60);
+ }
private static void chemicalReactorRecipes(){
GT_Values.RA.addChemicalRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index cadea514bc..91abea8363 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -60,6 +60,10 @@ public class RECIPES_Machines {
static ItemStack RECIPE_IndustrialBlastSmelterController = GregtechItemList.Industrial_AlloyBlastSmelter.get(1);
static ItemStack RECIPE_IndustrialBlastSmelterFrame = GregtechItemList.Casing_BlastSmelter.get(1);
static ItemStack RECIPE_IndustrialBlastSmelterCoil = GregtechItemList.Casing_Coil_BlastSmelter.get(1);
+ //Industrial Sieve
+ static ItemStack RECIPE_IndustrialSieveController = GregtechItemList.Industrial_Sifter.get(1);
+ static ItemStack RECIPE_IndustrialSieveFrame = GregtechItemList.Casing_Sifter.get(1);
+ static ItemStack RECIPE_IndustrialSieveGrate = GregtechItemList.Casing_SifterGrate.get(1);
//Buffer Cores
@@ -781,6 +785,26 @@ public class RECIPES_Machines {
"frameGtStellite", machineCasing_UV, "frameGtStellite",
"plateQuantum", "plateQuantum", "plateQuantum",
RECIPE_IndustrialMatterFabCoil);
+
+
+ //Industrial Sieve
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateEglinSteel", circuitTier2, "plateEglinSteel",
+ cableTier3, machineCasing_MV, cableTier3,
+ "plateEglinSteel", circuitTier2, "plateEglinSteel",
+ RECIPE_IndustrialSieveController);
+ //Industrial Sieve Casing
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateEglinSteel", "plateEglinSteel", "plateEglinSteel",
+ "plateEglinSteel", "frameGtTumbaga", "plateEglinSteel",
+ "plateEglinSteel", "plateEglinSteel", "plateEglinSteel",
+ RECIPE_IndustrialSieveFrame);
+ //Industrial Sieve Grate
+ RecipeUtils.addShapedGregtechRecipe(
+ "frameGtEglinSteel", "wireFineSteel", "frameGtEglinSteel",
+ "wireFineSteel", "wireFineSteel", "wireFineSteel",
+ "frameGtEglinSteel", "wireFineSteel", "frameGtEglinSteel",
+ RECIPE_IndustrialSieveGrate);
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 424b894341..0d9f3b3305 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -135,7 +135,7 @@ public enum GregtechItemList implements GregtechItemContainer {
//Casings Tier 2 [17-32]
Casing_StructuralGlass,
Casing_Refinery_External, Casing_Refinery_Structural, Casing_Refinery_Internal,
- Casing_PlaceHolder4, Casing_Sifter, Casing_PlaceHolder6,
+ Casing_PlaceHolder4, Casing_Sifter, Casing_SifterGrate,
Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9,
Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12,
Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15,
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index dc51184e71..0e93c8d807 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -43,7 +43,7 @@ extends GregtechMetaCasingBlocksAbstract {
GregtechItemList.Casing_Refinery_Internal.set(new ItemStack(this, 1, 3));
GregtechItemList.Casing_PlaceHolder4.set(new ItemStack(this, 1, 4));
GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5));
- GregtechItemList.Casing_PlaceHolder6.set(new ItemStack(this, 1, 6));
+ GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6));
GregtechItemList.Casing_PlaceHolder7.set(new ItemStack(this, 1, 7));
GregtechItemList.Casing_PlaceHolder8.set(new ItemStack(this, 1, 8));
GregtechItemList.Casing_PlaceHolder9.set(new ItemStack(this, 1, 9));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
index cd64f294f8..6f33188957 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialSifter.java
@@ -115,7 +115,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public boolean checkRecipe(final ItemStack aStack) {
- Utils.LOG_INFO("1");
+ Utils.LOG_WARNING("1");
//Get inputs.
final ArrayList<ItemStack> tInputList = this.getStoredInputs();
@@ -132,7 +132,7 @@ extends GregtechMeta_MultiBlockBase {
}
}
- Utils.LOG_INFO("2");
+ Utils.LOG_WARNING("2");
//Temp var
final ItemStack[] tInputs = Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);
@@ -143,7 +143,7 @@ extends GregtechMeta_MultiBlockBase {
}
- Utils.LOG_INFO("3");
+ Utils.LOG_WARNING("3");
//Make a recipe instance for the rest of the method.
final GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sSifterRecipes.findRecipe(this.getBaseMetaTileEntity(), false, 9223372036854775807L, null, tInputs);
@@ -152,53 +152,53 @@ extends GregtechMeta_MultiBlockBase {
if (cloneRecipe != tRecipe || cloneRecipe == null){
cloneRecipe = tRecipe.copy();
- Utils.LOG_INFO("Setting Recipe");
+ Utils.LOG_WARNING("Setting Recipe");
}
if (mInputStacks != tRecipe.mInputs || mInputStacks == null){
mInputStacks = tRecipe.mInputs;
- Utils.LOG_INFO("Setting Recipe Inputs");
+ Utils.LOG_WARNING("Setting Recipe Inputs");
}
if (cloneChances != tRecipe.mChances || cloneChances == null){
cloneChances = tRecipe.mChances.clone();
- Utils.LOG_INFO("Setting Chances");
+ Utils.LOG_WARNING("Setting Chances");
}
for (int r=0;r<cloneChances.length;r++){
- Utils.LOG_INFO("Original map Output["+r+"] chance = "+cloneChances[r]);
+ Utils.LOG_WARNING("Original map Output["+r+"] chance = "+cloneChances[r]);
}
- Utils.LOG_INFO("3.1");
+ Utils.LOG_WARNING("3.1");
//Change bonus chances
int[] outputChances;
- Utils.LOG_INFO("3.2");
+ Utils.LOG_WARNING("3.2");
if (cloneRecipe.mChances != null){
outputChances = cloneRecipe.mChances.clone();
- Utils.LOG_INFO("3.3");
+ Utils.LOG_WARNING("3.3");
for (int r=0;r<outputChances.length;r++){
- Utils.LOG_INFO("Output["+r+"] chance = "+outputChances[r]);
+ Utils.LOG_WARNING("Output["+r+"] chance = "+outputChances[r]);
if (outputChances[r]<10000){
int temp = outputChances[r];
if (outputChances[r] < 8000 && outputChances[r] >= 1){
outputChances[r] = temp+1200;
- Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]);
+ Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]);
}
else if (outputChances[r] < 9000 && outputChances[r] >= 8000){
outputChances[r] = temp+400;
- Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]);
+ Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]);
}
else if (outputChances[r] <= 9900 && outputChances[r] >= 9000){
outputChances[r] = temp+100;
- Utils.LOG_INFO("Output["+r+"] chance now = "+outputChances[r]);
+ Utils.LOG_WARNING("Output["+r+"] chance now = "+outputChances[r]);
}
}
}
- Utils.LOG_INFO("3.4");
+ Utils.LOG_WARNING("3.4");
//Rebuff Drop Rates for % output
cloneRecipe.mChances = outputChances;
@@ -206,11 +206,11 @@ extends GregtechMeta_MultiBlockBase {
}
- Utils.LOG_INFO("4");
+ Utils.LOG_WARNING("4");
final int tValidOutputSlots = this.getValidOutputSlots(this.getBaseMetaTileEntity(), cloneRecipe, tInputs);
- Utils.LOG_INFO("Sifter - Valid Output Hatches: "+tValidOutputSlots);
+ Utils.LOG_WARNING("Sifter - Valid Output Hatches: "+tValidOutputSlots);
//More than or one input
if ((tInputList.size() > 0) && (tValidOutputSlots >= 1)) {
generated by cgit (git 2.46.0) at 2025-03-10 16:41:01 +0000