aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/material/ALLOY.java11
-rw-r--r--src/Java/gtPlusPlus/core/util/item/ItemUtils.java18
-rw-r--r--src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java44
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java64
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java34
6 files changed, 87 insertions, 86 deletions
diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java
index d0bdd0b1e1..22b8e7445a 100644
--- a/src/Java/gtPlusPlus/core/material/ALLOY.java
+++ b/src/Java/gtPlusPlus/core/material/ALLOY.java
@@ -567,13 +567,10 @@ public final class ALLOY {
true, //Uses Blast furnace?
//Material Stacks with Percentage of required elements.
new MaterialStack[]{
- new MaterialStack(ALLOY.LEAGRISIUM, 25),
- new MaterialStack(ALLOY.ENERGYCRYSTAL, 25),
- new MaterialStack(ALLOY.ZIRCONIUM_CARBIDE, 25),
- new MaterialStack(ELEMENT.getInstance().MANGANESE, 5),
- new MaterialStack(ELEMENT.getInstance().MOLYBDENUM, 5),
- new MaterialStack(ELEMENT.getInstance().TUNGSTEN, 5),
- new MaterialStack(ELEMENT.getInstance().BERYLLIUM, 5),
+ new MaterialStack(ALLOY.STELLITE, 25),
+ new MaterialStack(ELEMENT.getInstance().GALLIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().AMERICIUM, 5),
+ new MaterialStack(ELEMENT.getInstance().PALLADIUM, 5),
new MaterialStack(ELEMENT.getInstance().BISMUTH, 5)
});
diff --git a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
index 21d969066c..00068f1871 100644
--- a/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/item/ItemUtils.java
@@ -246,11 +246,11 @@ public class ItemUtils {
public static ItemStack getItemStackOfAmountFromOreDictNoBroken(final String oredictName, final int amount){
if (CORE.DEBUG){
- Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(1));
- Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(2));
- Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(3));
- Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(4));
- Utils.LOG_INFO("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5));
+ Utils.LOG_WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(1));
+ Utils.LOG_WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(2));
+ Utils.LOG_WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(3));
+ Utils.LOG_WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(4));
+ Utils.LOG_WARNING("Looking up: "+oredictName+" - from method: "+ReflectionUtils.getMethodName(5));
}
try{
@@ -273,7 +273,7 @@ public class ItemUtils {
}
}
}
- Utils.LOG_INFO(oredictName+" was not valid.");
+ Utils.LOG_WARNING(oredictName+" was not valid.");
return null;
}
catch (Throwable t){
@@ -288,7 +288,7 @@ public class ItemUtils {
return returnValue.copy();
}
}
- Utils.LOG_INFO(material+" was not valid.");
+ Utils.LOG_WARNING(material+" was not valid.");
return null;
}
@@ -347,7 +347,7 @@ public class ItemUtils {
}
public static MultiPickaxeBase generateMultiPick(final boolean GT_Durability, final ToolMaterial customMaterial, final String name, final int durability, final short[] rgba, final Object enchantment){
- Utils.LOG_INFO("Generating a Multi-Pick out of "+name);
+ Utils.LOG_WARNING("Generating a Multi-Pick out of "+name);
final short[] rgb = rgba;
int dur = customMaterial.getMaxUses();
Utils.LOG_WARNING("Determined durability for "+name+" is "+dur);
@@ -384,7 +384,7 @@ public class ItemUtils {
if (MP_Redstone.isValid){
return MP_Redstone;
}
- Utils.LOG_INFO("Pickaxe was not valid.");
+ Utils.LOG_WARNING("Pickaxe was not valid.");
return null;
}
diff --git a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
index 72c33a2011..f4b6640668 100644
--- a/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
+++ b/src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java
@@ -23,20 +23,20 @@ public class RecipeUtils {
final ArrayList<Object> validSlots = new ArrayList<>();
if (resultItem == null){
- Utils.LOG_INFO("Found a recipe with an invalid output, yet had a valid inputs. Skipping.");
+ Utils.LOG_WARNING("Found a recipe with an invalid output, yet had a valid inputs. Skipping.");
return false;
}
if ((slot_1 == null) && (slot_2 == null) && (slot_3 == null) &&
(slot_4 == null) && (slot_5 == null) && (slot_6 == null) &&
(slot_7 == null) && (slot_8 == null) && (slot_9 == null)){
- Utils.LOG_INFO("Found a recipe with 0 inputs, yet had a valid output.");
- Utils.LOG_INFO("Error found while adding a recipe for: "+resultItem.getDisplayName()+" | Please report this issue on Github.");
+ Utils.LOG_WARNING("Found a recipe with 0 inputs, yet had a valid output.");
+ Utils.LOG_WARNING("Error found while adding a recipe for: "+resultItem.getDisplayName()+" | Please report this issue on Github.");
RegistrationHandler.recipesFailed++;
return false;
}
- //Utils.LOG_INFO("Trying to add a recipe for "+resultItem.toString());
+ //Utils.LOG_WARNING("Trying to add a recipe for "+resultItem.toString());
String a,b,c,d,e,f,g,h,i;
if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
Utils.LOG_WARNING(a);
@@ -110,7 +110,7 @@ public class RecipeUtils {
try {
GameRegistry.addRecipe(new ShapedOreRecipe(resultItem.copy(), validSlots.toArray()));
- //Utils.LOG_INFO("Success! Added a recipe for "+resultItem.getDisplayName());
+ //Utils.LOG_WARNING("Success! Added a recipe for "+resultItem.getDisplayName());
if (!COMPAT_HANDLER.areInitItemsLoaded){
RegistrationHandler.recipesSuccess++;
}
@@ -140,7 +140,7 @@ public class RecipeUtils {
final ArrayList<Object> validSlots = new ArrayList<>();
- Utils.LOG_INFO("Trying to add a recipe for "+Output.toString());
+ Utils.LOG_WARNING("Trying to add a recipe for "+Output.toString());
String a,b,c,d,e,f,g,h,i;
if (slot_1 == null){ a = " ";} else { a = "1";validSlots.add('1');validSlots.add(slot_1);}
Utils.LOG_WARNING(a);
@@ -184,7 +184,7 @@ public class RecipeUtils {
//GameRegistry.addRecipe(new ShapelessOreRecipe(Output, outputAmount), (Object[]) validSlots.toArray());
GameRegistry.addRecipe(new ShapelessOreRecipe(Output, validSlots.toArray()));
//GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2});
- Utils.LOG_INFO("Success! Added a recipe for "+Output.getDisplayName());
+ Utils.LOG_WARNING("Success! Added a recipe for "+Output.getDisplayName());
RegistrationHandler.recipesSuccess++;
}
catch(final RuntimeException k){
@@ -263,10 +263,10 @@ public class RecipeUtils {
if ((x instanceof Item) || (x instanceof ItemStack)){
if (x instanceof Item){
final ItemStack r = new ItemStack((Item) x);
- Utils.LOG_INFO("Removing Recipe for "+r.getUnlocalizedName());
+ Utils.LOG_WARNING("Removing Recipe for "+r.getUnlocalizedName());
}
else {
- Utils.LOG_INFO("Removing Recipe for "+((ItemStack) x).getUnlocalizedName());
+ Utils.LOG_WARNING("Removing Recipe for "+((ItemStack) x).getUnlocalizedName());
}
if (x instanceof ItemStack){
final Item r = ((ItemStack) x).getItem();
@@ -274,15 +274,15 @@ public class RecipeUtils {
x = r;
}
else {
- Utils.LOG_INFO("Recipe removal failed - Tell Alkalus.");
+ Utils.LOG_WARNING("Recipe removal failed - Tell Alkalus.");
return false;
}
}
if (RecipeUtils.attemptRecipeRemoval((Item) x)){
- Utils.LOG_INFO("Recipe removal successful");
+ Utils.LOG_WARNING("Recipe removal successful");
return true;
}
- Utils.LOG_INFO("Recipe removal failed - Tell Alkalus.");
+ Utils.LOG_WARNING("Recipe removal failed - Tell Alkalus.");
return false;
}
return false;
@@ -297,7 +297,7 @@ public class RecipeUtils {
final ItemStack is = items.next().getRecipeOutput();
if ((is != null) && (is.getItem() == I)){
items.remove();
- Utils.LOG_INFO("Remove a recipe with "+I.getUnlocalizedName()+" as output.");
+ Utils.LOG_WARNING("Remove a recipe with "+I.getUnlocalizedName()+" as output.");
continue;
}
}
@@ -316,7 +316,7 @@ public class RecipeUtils {
Utils.LOG_WARNING("Should be all gone now after double checking, so return true.");
return true;
}
- Utils.LOG_INFO("Return false, because something went wrong.");
+ Utils.LOG_WARNING("Return false, because something went wrong.");
return false;
}
@@ -342,7 +342,7 @@ public class RecipeUtils {
}
else {
if (OutputItem != null){
- Utils.LOG_INFO("Adding recipe for "+OutputItem.getDisplayName()+" failed. Error 62.");
+ Utils.LOG_WARNING("Adding recipe for "+OutputItem.getDisplayName()+" failed. Error 62.");
}
RegistrationHandler.recipesFailed++;
return false;
@@ -352,7 +352,7 @@ public class RecipeUtils {
public static boolean addShapedGregtechRecipe(final Object[] inputs, ItemStack output){
if (inputs.length != 9){
- Utils.LOG_INFO("Input array for "+output.getDisplayName()+" does not equal 9. "+inputs.length+" is the actual size.");
+ Utils.LOG_WARNING("Input array for "+output.getDisplayName()+" does not equal 9. "+inputs.length+" is the actual size.");
RegistrationHandler.recipesFailed++;
return false;
@@ -361,17 +361,17 @@ public class RecipeUtils {
for (int x=0;x<9;x++){
if (inputs[x] == null){
inputs[x] = " ";
- Utils.LOG_INFO("Input slot "+x+" changed from NULL to a blank space.");
+ Utils.LOG_WARNING("Input slot "+x+" changed from NULL to a blank space.");
}
else if (!(inputs[x] instanceof ItemStack) && !(inputs[x] instanceof String)){
if (output != null){
- Utils.LOG_INFO("Invalid Item inserted into inputArray. Item:"+output.getDisplayName()+" has a bad recipe. Please report to Alkalus.");
+ Utils.LOG_WARNING("Invalid Item inserted into inputArray. Item:"+output.getDisplayName()+" has a bad recipe. Please report to Alkalus.");
RegistrationHandler.recipesFailed++;
return false;
}
else {
- Utils.LOG_INFO("Output is Null for a recipe. Report to Alkalus.");
+ Utils.LOG_WARNING("Output is Null for a recipe. Report to Alkalus.");
output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1);
}
}
@@ -390,13 +390,13 @@ public class RecipeUtils {
'G', inputs[6],
'H', inputs[7],
'I', inputs[8]})){
- Utils.LOG_INFO("Success! Added a recipe for "+output.getDisplayName());
+ Utils.LOG_WARNING("Success! Added a recipe for "+output.getDisplayName());
RegistrationHandler.recipesSuccess++;
return true;
}
else {
if (output != null){
- Utils.LOG_INFO("Adding recipe for "+output.getDisplayName()+" failed. Error 61.");
+ Utils.LOG_WARNING("Adding recipe for "+output.getDisplayName()+" failed. Error 61.");
}
return false;
}
@@ -406,7 +406,7 @@ public class RecipeUtils {
//Catch Invalid Recipes
if (inputItems.length > 9 || inputItems.length < 1){
if (OutputItem != null){
- Utils.LOG_INFO("Invalid input array for shapeless recipe, which should output "+OutputItem.getDisplayName());
+ Utils.LOG_WARNING("Invalid input array for shapeless recipe, which should output "+OutputItem.getDisplayName());
}
return false;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index a206dafd59..5dfb9ebd2b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -64,7 +64,7 @@ public class HANDLER_GT {
public static void postInit(){
//Register some custom recipe maps for any enabled multiblocks.
- MultiblockRecipeMapHandler.run();
+ //MultiblockRecipeMapHandler.run();
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index fee6fbc63c..d66649850a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -74,7 +74,6 @@ public class RecipeGen_BlastSmelter implements Runnable{
duration = 40*M.vTier*20;
}
-
int mMaterialListSize=0;
if (M.getComposites() != null){
for (final gtPlusPlus.core.material.MaterialStack ternkfsdf : M.getComposites()){
@@ -87,7 +86,12 @@ public class RecipeGen_BlastSmelter implements Runnable{
mMaterialListSize = 1;
}
- Utils.LOG_WARNING("Size: "+mMaterialListSize);
+ if (duration <= 0){
+ int second = 20;
+ duration = 14*second*mMaterialListSize;
+ }
+
+ Utils.LOG_WARNING("[BAS] Size: "+mMaterialListSize);
//Make a simple one Material Materialstack[] and log it for validity.
@@ -95,10 +99,10 @@ public class RecipeGen_BlastSmelter implements Runnable{
final ItemStack[] tItemStackTest = new ItemStack[]{circuitGT, tStack};
inputStackCount = 1;
fluidAmount = 144*inputStackCount;
- Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
+ Utils.LOG_WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+". Gives "+fluidAmount+"L of molten metal.");
for (int das=0;das<tItemStackTest.length;das++){
if (tItemStackTest[das] != null) {
- Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
+ Utils.LOG_WARNING("[BAS] tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
}
}
@@ -108,50 +112,50 @@ public class RecipeGen_BlastSmelter implements Runnable{
if (hasMoreInputThanACircuit){
if (M.requiresBlastFurnace()) {
if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
- Utils.LOG_WARNING("Success.");
- Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe.");
+ Utils.LOG_WARNING("[BAS] Success.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration, 120)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
if (GT_Values.RA.addFluidExtractionRecipe(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1), null, M.getFluid(16), 100, duration/9, 120)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/4, 120)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/9, 120)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
}
}
else {
- Utils.LOG_WARNING("Failed.");
+ Utils.LOG_WARNING("[BAS] Failed.");
}
}
else {
if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration/2, 120)){
- Utils.LOG_WARNING("Success.");
+ Utils.LOG_WARNING("[BAS] Success.");
if (GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ingot.get(0), M.getFluid(144), M.getIngot(1), duration/2, 60)){
- Utils.LOG_WARNING("Success, Also added a Fluid solidifier recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid solidifier recipe.");
if (GT_Values.RA.addFluidExtractionRecipe(M.getIngot(1), null, M.getFluid(144), 100, duration/2, 60)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
final ItemStack tempitem = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("nugget"+M.getUnlocalizedName(), 1);
if (tempitem != null){
if (GT_Values.RA.addFluidExtractionRecipe(tempitem, null, M.getFluid(16), 100, duration/2/9, 60)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
}
if (GT_Values.RA.addFluidExtractionRecipe(M.getSmallDust(1), null, M.getFluid(36), 100, duration/2/4, 60)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
if (GT_Values.RA.addFluidExtractionRecipe(M.getTinyDust(1), null, M.getFluid(16), 100, duration/2/9, 60)){
- Utils.LOG_WARNING("Success, Also added a Fluid Extractor recipe.");
+ Utils.LOG_WARNING("[BAS] Success, Also added a Fluid Extractor recipe.");
}
}
}
else {
- Utils.LOG_WARNING("Failed.");
+ Utils.LOG_WARNING("[BAS] Failed.");
}
}
@@ -174,8 +178,8 @@ public class RecipeGen_BlastSmelter implements Runnable{
for (final gtPlusPlus.core.material.MaterialStack xMaterial : M.getComposites()){
if (xMaterial != null){
if (xMaterial.getStackMaterial() != null){
- Utils.LOG_WARNING("FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
- Utils.LOG_WARNING("ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
+ Utils.LOG_WARNING("[BAS] FOUND: "+xMaterial.getStackMaterial().getLocalizedName());
+ Utils.LOG_WARNING("[BAS] ADDING: "+xMaterial.getStackMaterial().getLocalizedName());
}
tempStack[ooo] = xMaterial;
}
@@ -207,45 +211,45 @@ public class RecipeGen_BlastSmelter implements Runnable{
components[fr] = components_NoCircuit[fr-1];
}
}
- Utils.LOG_WARNING("Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
+ Utils.LOG_WARNING("[BAS] Should have added a circuit. mMaterialListSize: "+mMaterialListSize+" | circuit: "+components[0].getDisplayName());
}
else {
- Utils.LOG_WARNING("Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
+ Utils.LOG_WARNING("[BAS] Did not add a circuit. mMaterialListSize: "+mMaterialListSize);
}
//Set Fluid output
fluidAmount = 144*inputStackCount;
- Utils.LOG_WARNING("Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
- Utils.LOG_WARNING("tMaterial.length: "+components.length+".");
+ Utils.LOG_WARNING("[BAS] Adding an Alloy Blast Smelter Recipe for "+M.getLocalizedName()+" using it's compound dusts. This material has "+ inputStackCount+" parts. Gives "+fluidAmount+"L of molten metal.");
+ Utils.LOG_WARNING("[BAS] tMaterial.length: "+components.length+".");
for (int das=0;das<components.length;das++){
if (components[das] != null) {
- Utils.LOG_WARNING("tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
+ Utils.LOG_WARNING("[BAS] tMaterial["+das+"]: "+components[das].getDisplayName()+" Meta: "+components[das].getItemDamage()+", Amount: "+components[das].stackSize);
}
}
//Adds Recipe
if (M.requiresBlastFurnace()) {
if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 500)){
- Utils.LOG_WARNING("Success.");
+ Utils.LOG_WARNING("[BAS] Success.");
}
else {
- Utils.LOG_WARNING("Failed.");
+ Utils.LOG_WARNING("[BAS] Failed.");
}
}
else {
if (CORE.RA.addBlastSmelterRecipe(components, M.getFluid(fluidAmount), 100, duration, 240)){
- Utils.LOG_WARNING("Success.");
+ Utils.LOG_WARNING("[BAS] Success.");
}
else {
- Utils.LOG_WARNING("Failed.");
+ Utils.LOG_WARNING("[BAS] Failed.");
}
}
}
}
}
else {
- Utils.LOG_WARNING("doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
+ Utils.LOG_WARNING("[BAS] doTest: "+doTest+" | tMaterial != null: "+(tMaterial != null));
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 12e7bb9bfc..64ee1152f6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -23,7 +23,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
//RECIPEHANDLER_CokeOven.debug1();
if (((aInput1 == null) /*&& (aFluidInput == null)*/) || ((aOutput == null) || (aFluidOutput == null))) {
//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
- Utils.LOG_INFO("Something was null, returning false");
+ Utils.LOG_WARNING("Something was null, returning false");
return false;
}
@@ -32,7 +32,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
//RECIPEHANDLER_CokeOven.debug2(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
if ((aOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aOutput, aDuration)) <= 0)) {
//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
- Utils.LOG_INFO("Something was null, returning false");
+ Utils.LOG_WARNING("Something was null, returning false");
return false;
}
@@ -41,7 +41,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
//RECIPEHANDLER_CokeOven.debug3(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, aEUt);
if ((aFluidOutput == null) || ((aDuration = GregTech_API.sRecipeFile.get("cokeoven", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
//Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
- Utils.LOG_INFO("Something was null, returning false");
+ Utils.LOG_WARNING("Something was null, returning false");
return false;
}
@@ -62,12 +62,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return true;
} catch (final NullPointerException e){
- Utils.LOG_INFO("Something was null, returning false");
+ Utils.LOG_WARNING("Something was null, returning false");
return false;
}
} catch (final Throwable e){
Utils.LOG_WARNING("aInput1:"+aInput1.toString()+" aInput2:"+aInput2.toString()+" aFluidInput:"+aFluidInput.toString()+" aFluidOutput:"+aFluidOutput.toString()+" aOutput:"+aOutput.toString()+" aDuration:"+aDuration+" aEU/t:"+aEUt);
- Utils.LOG_INFO("Failed.");
+ Utils.LOG_WARNING("Failed.");
e.getStackTrace();
return false;
}
@@ -132,7 +132,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addFuel(final ItemStack aInput1, final ItemStack aOutput1, final int aEU, final int aType) {
if (aInput1 == null) {
- Utils.LOG_INFO("Fuel Input is Invalid.");
+ Utils.LOG_WARNING("Fuel Input is Invalid.");
return false;
}
//new GregtechRecipe(aInput1, aOutput1, GregTech_API.sRecipeFile.get("fuel_" + aType, aInput1, aEU), aType);
@@ -188,7 +188,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addDehydratorRecipe(final ItemStack aInput, final FluidStack aFluid, final ItemStack[] aOutput, int aDuration, final int aEUt) {
- Utils.LOG_INFO("Trying to add a Dehydrator recipe.");
+ Utils.LOG_WARNING("Trying to add a Dehydrator recipe.");
try{
if ((aInput == null) || (aFluid == null) || (aOutput == null)) {
return false;
@@ -199,7 +199,7 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, new ItemStack[]{aInput}, aOutput, null, new FluidStack[]{aFluid}, null, aDuration, aEUt, 0);
//RECIPEHANDLER_Dehydrator.debug5(aInput, null, aFluid, null, aOutput, aDuration, aEUt);
return true;
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
+ }catch (final NullPointerException e){Utils.LOG_WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
}
@@ -207,18 +207,18 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
@Override
public boolean addDehydratorRecipe(final ItemStack[] aInput, final FluidStack aFluidInput, final FluidStack aFluidOutput, final ItemStack[] aOutputItems, final int[] aChances, int aDuration, final int aEUt) throws IndexOutOfBoundsException{
- Utils.LOG_INFO("Trying to add a Dehydrator recipe.");
+ Utils.LOG_WARNING("Trying to add a Dehydrator recipe.");
try{
if (aInput[0] != null){
- Utils.LOG_INFO("Recipe requires input: "+aInput[0].getDisplayName()+" x"+aInput[0].stackSize);
+ Utils.LOG_WARNING("Recipe requires input: "+aInput[0].getDisplayName()+" x"+aInput[0].stackSize);
}
if (aInput.length > 1){
if (aInput[1] != null){
- Utils.LOG_INFO("Recipe requires input: "+aInput[1].getDisplayName()+" x"+aInput[1].stackSize);
+ Utils.LOG_WARNING("Recipe requires input: "+aInput[1].getDisplayName()+" x"+aInput[1].stackSize);
}
}
if (aFluidInput != null){
- Utils.LOG_INFO("Recipe requires input: "+aFluidInput.getFluid().getName()+" "+aFluidInput.amount+"mbst");
+ Utils.LOG_WARNING("Recipe requires input: "+aFluidInput.getFluid().getName()+" "+aFluidInput.amount+"mbst");
}
if (((aInput[0] == null) && (aFluidInput == null)) || ((aOutputItems == null) && (aFluidOutput == null))) {
return false;
@@ -227,30 +227,30 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
if (aOutputItems != null){
- Utils.LOG_INFO("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems));
+ Utils.LOG_WARNING("Recipe will output: "+ItemUtils.getArrayStackNames(aOutputItems));
}
if ((aFluidOutput != null) && ((aDuration = GregTech_API.sRecipeFile.get("dehydrator", aFluidOutput.getFluid().getName(), aDuration)) <= 0)) {
return false;
}
if (aFluidOutput != null){
- Utils.LOG_INFO("Recipe will output: "+aFluidOutput.getFluid().getName());
+ Utils.LOG_WARNING("Recipe will output: "+aFluidOutput.getFluid().getName());
}
if (aInput.length == 1){
- Utils.LOG_INFO("Dehydrator recipe only has a single input item.");
+ Utils.LOG_WARNING("Dehydrator recipe only has a single input item.");
Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
}
else {
- Utils.LOG_INFO("Dehydrator recipe has two input items.");
+ Utils.LOG_WARNING("Dehydrator recipe has two input items.");
Recipe_GT.Gregtech_Recipe_Map.sChemicalDehydratorRecipes.addRecipe(true, aInput, aOutputItems, null, aChances, new FluidStack[]{aFluidInput}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
}
return true;
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
+ }catch (final NullPointerException e){Utils.LOG_WARNING("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");return false;}
}
generated by cgit (git 2.46.0) at 2025-03-10 22:21:56 +0000