aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/material
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/material')
-rw-r--r--src/Java/gtPlusPlus/core/material/MaterialGenerator.java55
-rw-r--r--src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java6
2 files changed, 34 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
index 01690fa233..a596b9bdf1 100644
--- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
+++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java
@@ -9,6 +9,7 @@ import gtPlusPlus.core.block.base.BlockBaseModular;
import gtPlusPlus.core.block.base.BlockBaseOre;
import gtPlusPlus.core.item.base.bolts.BaseItemBolt;
import gtPlusPlus.core.item.base.dusts.BaseItemDust;
+import gtPlusPlus.core.item.base.dusts.BaseItemDustEx;
import gtPlusPlus.core.item.base.gears.BaseItemGear;
import gtPlusPlus.core.item.base.ingots.BaseItemIngot;
import gtPlusPlus.core.item.base.ingots.BaseItemIngotHot;
@@ -100,7 +101,7 @@ public class MaterialGenerator {
Item temp;
Block tempBlock;
tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
-
+
temp = new BaseItemIngot(matInfo);
temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation);
temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation);
@@ -129,7 +130,7 @@ public class MaterialGenerator {
return true;
}
else if (matInfo.getState() == MaterialState.ORE){
-
+
}
//Add A jillion Recipes - old code
@@ -146,9 +147,9 @@ public class MaterialGenerator {
RecipeGen_MaterialProcessing.generateRecipes(matInfo);
new RecipeGen_Recycling(matInfo);
return true;
-
- } catch (final Throwable t)
-
+
+ } catch (final Throwable t)
+
{
Logger.WARNING(""+matInfo.getLocalizedName()+" failed to generate.");
return false;
@@ -206,22 +207,28 @@ public class MaterialGenerator {
Block tempBlock;
tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour);
- temp = new BaseItemIngot(matInfo);
- temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", 3, sRadiation);
+ //temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", 3, sRadiation);
temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", 2, sRadiation);
temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", 1, sRadiation);
+
+ temp = new BaseItemDustEx(matInfo);
+ temp = new BaseItemIngot(matInfo);
temp = new BaseItemNugget(matInfo);
- temp = new BaseItemPlate(matInfo);
- temp = new BaseItemPlateDouble(matInfo);
+
+ if (generatePlates) {
+ temp = new BaseItemPlate(matInfo);
+ temp = new BaseItemPlateDouble(matInfo);
+ RecipeGen_Plates.generateRecipes(matInfo);
+ RecipeGen_Extruder.generateRecipes(matInfo);
+ RecipeGen_Assembler.generateRecipes(matInfo);
+ }
- RecipeGen_Plates.generateRecipes(matInfo);
- RecipeGen_Extruder.generateRecipes(matInfo);
RecipeGen_ShapedCrafting.generateRecipes(matInfo);
RecipeGen_Fluids.generateRecipes(matInfo);
- RecipeGen_Assembler.generateRecipes(matInfo);
- RecipeGen_DustGeneration.generateRecipes(matInfo, true);
RecipeGen_MaterialProcessing.generateRecipes(matInfo);
- new RecipeGen_Recycling(matInfo);
+ RecipeGen_DustGeneration.generateRecipes(matInfo, true);
+ new RecipeGen_Recycling(matInfo);
+
} catch (final Throwable t){
Logger.WARNING(""+matInfo.getLocalizedName()+" failed to generate.");
}
@@ -231,27 +238,27 @@ public class MaterialGenerator {
public static void generateOreMaterial(final Material matInfo){
generateOreMaterial(matInfo, true, true, true, matInfo.getRGBA());
}
-
+
@SuppressWarnings("unused")
public static void generateOreMaterial(final Material matInfo, boolean generateOre, boolean generateDust, boolean generateSmallTinyDusts, short[] customRGB){
try {
-
+
if (matInfo == null){
Logger.DEBUG_MATERIALS("Invalid Material while constructing null material.");
return;
}
-
+
final String unlocalizedName = matInfo.getUnlocalizedName();
final String materialName = matInfo.getLocalizedName();
final short[] C = customRGB;
final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]);
-
+
if (Colour == null){
Logger.DEBUG_MATERIALS("Invalid Material while constructing "+materialName+".");
return;
}
-
+
int sRadiation = 0;
if (matInfo.vRadiationLevel > 0){
sRadiation = matInfo.vRadiationLevel;
@@ -259,10 +266,10 @@ public class MaterialGenerator {
Item temp;
Block tempBlock;
-
-
+
+
if (generateOre) {
- tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue());
+ tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue());
}
if (generateDust) {
@@ -272,7 +279,7 @@ public class MaterialGenerator {
temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", matInfo.vTier, sRadiation, false);
temp = new BaseItemDust("itemDustSmall"+unlocalizedName, materialName, matInfo, Colour, "Small", matInfo.vTier, sRadiation, false);
}
-
+
temp = new BaseItemCrushedOre(matInfo);
temp = new BaseItemCentrifugedCrushedOre(matInfo);
temp = new BaseItemPurifiedCrushedOre(matInfo);
@@ -280,7 +287,7 @@ public class MaterialGenerator {
temp = new BaseItemPurifiedDust(matInfo);
RecipeGen_Ore.generateRecipes(matInfo);
-
+
} catch (final Throwable t){
Logger.MATERIALS("[Error] "+(matInfo != null ? matInfo.getLocalizedName() : "Null Material")+" failed to generate.");
t.printStackTrace();
diff --git a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
index 0c81a39959..45d35d1022 100644
--- a/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
+++ b/src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java
@@ -17,7 +17,7 @@ public final class NUCLIDE {
870, //Boiling Point in C
150, //Protons
150, //Neutrons
- false, //Uses Blast furnace?
+ true, //Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ThF4UF4"), //Chemical Formula
5, //Radioactivity Level
//Material Stacks with Percentage of required elements.
@@ -36,7 +36,7 @@ public final class NUCLIDE {
940, //Boiling Point in C
150, //Protons
150, //Neutrons
- false, //Uses Blast furnace?
+ true, //Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4UF4"), //Chemical Formula
5, //Radioactivity Level
//Material Stacks with Percentage of required elements.
@@ -55,7 +55,7 @@ public final class NUCLIDE {
890, //Boiling Point in C
150, //Protons
150, //Neutrons
- false, //Uses Blast furnace?
+ true, //Uses Blast furnace?
StringUtils.subscript(StringUtils.superscript("7")+"LiFBeF2ZrF4")+StringUtils.superscript("235U"), //Chemical Formula
5, //Radioactivity Level
//Material Stacks with Percentage of required elements.
generated by cgit (git 2.46.0) at 2025-11-25 15:49:51 +0000