aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-08-30 15:42:35 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-08-30 15:42:35 +1000
commit35d165e6d72b21920e14540dea1465488fd5db3d (patch)
treec9d4431f1ed9a9907f584509999728c17cc09c4b /src
parent99c8ea64db96940ca8f37e5b36d8d8b5e6a53f95 (diff)
downloadGT5-Unofficial-35d165e6d72b21920e14540dea1465488fd5db3d.tar.gz
GT5-Unofficial-35d165e6d72b21920e14540dea1465488fd5db3d.tar.bz2
GT5-Unofficial-35d165e6d72b21920e14540dea1465488fd5db3d.zip
% Changed the log messages for all generated items to only show in debug mode.
+ Added in Uranium 233 as a material, to be used in the Liquid fluoride thorium reactor.
Diffstat (limited to 'src')
-rw-r--r--src/Java/miscutil/core/block/base/BlockBaseModular.java27
-rw-r--r--src/Java/miscutil/core/item/ModItems.java4
-rw-r--r--src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java2
-rw-r--r--src/Java/miscutil/core/item/base/dusts/BaseItemDust.java20
-rw-r--r--src/Java/miscutil/core/item/base/gears/BaseItemGear.java2
-rw-r--r--src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java2
-rw-r--r--src/Java/miscutil/core/item/base/plates/BaseItemPlate.java2
-rw-r--r--src/Java/miscutil/core/item/base/rings/BaseItemRing.java2
-rw-r--r--src/Java/miscutil/core/item/base/rods/BaseItemRod.java2
-rw-r--r--src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java2
-rw-r--r--src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java2
-rw-r--r--src/Java/miscutil/core/item/base/screws/BaseItemScrew.java2
12 files changed, 36 insertions, 33 deletions
diff --git a/src/Java/miscutil/core/block/base/BlockBaseModular.java b/src/Java/miscutil/core/block/base/BlockBaseModular.java
index e1fbde6d39..79817d6759 100644
--- a/src/Java/miscutil/core/block/base/BlockBaseModular.java
+++ b/src/Java/miscutil/core/block/base/BlockBaseModular.java
@@ -3,7 +3,6 @@ package miscutil.core.block.base;
import miscutil.core.item.base.itemblock.ItemBlockGtBlock;
import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox;
import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
import miscutil.core.util.math.MathUtils;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,40 +30,40 @@ public class BlockBaseModular extends BasicBlock{
this.setBlockName(getLocalizedName());
if (!CORE.DEBUG){
- Utils.LOG_INFO("=============Block Info Dump=============");
- Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase());
- Utils.LOG_INFO("This Blocks Type - "+thisBlockType);
- Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - "+BlockTypes.STANDARD.name().toLowerCase());
- Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - "+BlockTypes.FRAME.name().toLowerCase());
- Utils.LOG_INFO("blockMaterial - "+blockMaterial);
- Utils.LOG_INFO("==========================================");
+ //Utils.LOG_INFO("=============Block Info Dump=============");
+ //Utils.LOG_INFO("thisBlock.name().toLowerCase() - "+thisBlock.name().toLowerCase());
+ //Utils.LOG_INFO("This Blocks Type - "+thisBlockType);
+ //Utils.LOG_INFO("BlockTypes.STANDARD.name().toLowerCase() - "+BlockTypes.STANDARD.name().toLowerCase());
+ //Utils.LOG_INFO("BlockTypes.FRAME.name().toLowerCase() - "+BlockTypes.FRAME.name().toLowerCase());
+ //Utils.LOG_INFO("blockMaterial - "+blockMaterial);
+ //Utils.LOG_INFO("==========================================");
}
if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
LanguageRegistry.addName(this, "Block of "+blockMaterial);
- Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial);
+ //Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial);
}
else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
LanguageRegistry.addName(this, blockMaterial+ " Frame Box");
- Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
+ //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box");
}
else {
LanguageRegistry.addName(this, blockMaterial);
- Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial);
+ //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial);
}
//setOreDict(unlocalizedName, blockType);
if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){
GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);
- Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial);
+ //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial);
}
else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){
GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, blockType.getTexture()+unlocalizedName);
- Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");
+ //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box");
}
else {
GameRegistry.registerBlock(this, ItemBlockGtBlock.class, blockType.getTexture()+unlocalizedName);
- Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial);
+ //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial);
}
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 7d0eb4dac0..e06bbad8a6 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -284,6 +284,10 @@ public final class ModItems {
UtilsItems.generateItemsFromMaterial("NiobiumCarbide", "Niobium Carbide", 6, MaterialInfo.NIOMBIUMCARBIDE, Utils.rgbtoHexValue(205, 197, 191), true);
+ //Uranium-233
+ UtilsItems.generateItemsFromMaterial("Uranium233", "Uranium 233", 2, MaterialInfo.INCONEL792, Utils.rgbtoHexValue(73, 220, 83), true); //Uranium-233 is a fissile isotope of uranium that is bred from thorium-232 as part of the thorium fuel cycle.
+
+
//EnderIO Resources
if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){
Utils.LOG_INFO("EnderIO Found - Loading Resources.");
diff --git a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
index d33ca866ba..a30b7f7acb 100644
--- a/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
+++ b/src/Java/miscutil/core/item/base/bolts/BaseItemBolt.java
@@ -67,7 +67,7 @@ public class BaseItemBolt extends Item{
}
private void addExtruderRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Bolts");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Bolts");
String tempIngot = unlocalName.replace("itemBolt", "ingot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
index c1311f0c7b..8f6976700f 100644
--- a/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
+++ b/src/Java/miscutil/core/item/base/dusts/BaseItemDust.java
@@ -187,19 +187,19 @@ public class BaseItemDust extends Item{
if (inputStacks.length >= 2){
for (ItemStack is : inputStacks){
if (is != null){
- Utils.LOG_INFO("Found "+is.getDisplayName()+" as an input for mixer recipe.");
+ Utils.LOG_WARNING("Found "+is.getDisplayName()+" as an input for mixer recipe.");
if (is.getDisplayName().toLowerCase().contains("tell alkalus")){
ItemStack tempStackForAName = inputStacks[i];
String[] inputList = dustInfo.getInputItemsAsList();
int[] inputSizes = dustInfo.getInputStackSizesAsList();
inputStacks[i] = UtilsItems.getItemStackOfAmountFromOreDict(inputList[i], inputSizes[i]);
- Utils.LOG_INFO("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");
+ Utils.LOG_WARNING("Swapping input slot "+i+" which contains "+tempStackForAName.getDisplayName()+" with "+inputStacks[i].getDisplayName()+".");
}
}
else {
- Utils.LOG_INFO("Input "+i+" was null.");
+ Utils.LOG_WARNING("Input "+i+" was null.");
}
i++;
@@ -226,7 +226,7 @@ public class BaseItemDust extends Item{
}
private void addMacerationRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Dusts");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Dusts");
String tempIngot = getUnlocalizedName().replace("item.itemDust", "ingot");
String tempDust = getUnlocalizedName().replace("item.itemDust", "dust");
@@ -283,18 +283,18 @@ public class BaseItemDust extends Item{
if (temp != null && temp != ""){
if (this.useBlastFurnace){
- Utils.LOG_INFO("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace.");
+ Utils.LOG_WARNING("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace.");
String tempIngot = temp.replace("ingot", "ingotHot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
- Utils.LOG_INFO("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
+ Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot);
if (null != tempOutputStack){
addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
}
return;
}
- Utils.LOG_INFO("Adding recipe for "+materialName+" Ingots in a furnace.");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a furnace.");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(temp, 1);
- Utils.LOG_INFO("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
+ Utils.LOG_WARNING("This will produce an ingot of "+tempOutputStack.getDisplayName() + " Debug: "+temp);
if (null != tempOutputStack){
if (mTier < 5){
if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
@@ -305,8 +305,8 @@ public class BaseItemDust extends Item{
}
}
else if (mTier >= 5){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Ingots in a Blast furnace.");
- Utils.LOG_INFO("This will produce "+tempOutputStack.getDisplayName());
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Ingots in a Blast furnace.");
+ Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName());
if (null != tempOutputStack){
addBlastFurnaceRecipe(UtilsItems.getSimpleStack(this), null, tempOutputStack, null, 350*mTier);
}
diff --git a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
index f9b13742ca..96559bf7d7 100644
--- a/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
+++ b/src/Java/miscutil/core/item/base/gears/BaseItemGear.java
@@ -67,7 +67,7 @@ public class BaseItemGear extends Item{
}
private void addExtruderRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Gears");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Gears");
String tempIngot = unlocalName.replace("itemGear", "ingot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 8);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
index e7be91bc8c..e8a31f599d 100644
--- a/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
+++ b/src/Java/miscutil/core/item/base/ingots/BaseItemIngotHot.java
@@ -49,7 +49,7 @@ public class BaseItemIngotHot extends BaseItemIngot{
}
private void generateRecipe(){
- Utils.LOG_INFO("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+".");
+ Utils.LOG_WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of "+materialName+".");
GT_Values.RA.addVacuumFreezerRecipe(UtilsItems.getSimpleStack(this), outputIngot.copy(), 60*mTier);
diff --git a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
index ff211077b6..92fe7262de 100644
--- a/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
+++ b/src/Java/miscutil/core/item/base/plates/BaseItemPlate.java
@@ -66,7 +66,7 @@ public class BaseItemPlate extends Item{
}
private void addBendingRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Plates");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Plates");
String tempIngot = unlocalName.replace("itemPlate", "ingot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
index dbbb233098..ead6f3f15f 100644
--- a/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
+++ b/src/Java/miscutil/core/item/base/rings/BaseItemRing.java
@@ -67,7 +67,7 @@ public class BaseItemRing extends Item{
}
private void addExtruderRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Rings");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Rings");
String tempIngot = unlocalName.replace("itemRing", "ingot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
index 8ae9d0a7f4..454669dbc1 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRod.java
@@ -68,7 +68,7 @@ public class BaseItemRod extends Item{
}
private void addExtruderRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Rods");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Rods");
String tempIngot = unlocalName.replace("itemRod", "ingot");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
index af9f27617d..0ad5f1cfd9 100644
--- a/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
+++ b/src/Java/miscutil/core/item/base/rods/BaseItemRodLong.java
@@ -67,7 +67,7 @@ public class BaseItemRodLong extends Item{
}
private void addExtruderRecipe(){
- Utils.LOG_INFO("Adding recipe for Long "+materialName+" Rods");
+ Utils.LOG_WARNING("Adding recipe for Long "+materialName+" Rods");
String tempIngot = unlocalName.replace("itemRodLong", "stick");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 2);
if (null != tempOutputStack){
diff --git a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java
index 35610975ad..1249637981 100644
--- a/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java
+++ b/src/Java/miscutil/core/item/base/rotors/BaseItemRotor.java
@@ -72,7 +72,7 @@ public class BaseItemRotor extends Item{
public void generateRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Rotors");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Rotors");
String tempIngot = unlocalName.replace("itemRotor", "plate");
ItemStack tempOutputStack = UtilsItems.getItemStackOfAmountFromOreDict(tempIngot, 1);
Utils.LOG_WARNING("Found for recipe:"+tempIngot+ "isValidStack()="+getValidItemStack(tempOutputStack));
diff --git a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
index 9282cce3f3..fe86b4dcd8 100644
--- a/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/miscutil/core/item/base/screws/BaseItemScrew.java
@@ -68,7 +68,7 @@ public class BaseItemScrew extends Item{
}
private void addLatheRecipe(){
- Utils.LOG_INFO("Adding recipe for "+materialName+" Screws");
+ Utils.LOG_WARNING("Adding recipe for "+materialName+" Screws");
ItemStack boltStack = UtilsItems.getItemStackOfAmountFromOreDict(unlocalName.replace("itemScrew", "bolt"), 1);
if (null != boltStack){
GT_Values.RA.addLatheRecipe(boltStack,