aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-04-18 00:13:50 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-04-18 00:13:50 +1000
commitb9d166c56f38dee13b5a03cab93f504b46fed7d2 (patch)
tree85e73e681f996eed4b7a9c5518ee72c0845bc116 /src/Java/gtPlusPlus/xmod/gregtech/loaders
parentc6a5a5fae97f64392806d7830794f792c3d214fd (diff)
downloadGT5-Unofficial-b9d166c56f38dee13b5a03cab93f504b46fed7d2.tar.gz
GT5-Unofficial-b9d166c56f38dee13b5a03cab93f504b46fed7d2.tar.bz2
GT5-Unofficial-b9d166c56f38dee13b5a03cab93f504b46fed7d2.zip
$ Small fixes.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java21
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java12
2 files changed, 17 insertions, 16 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java
index 987a1c8fbf..29e362c7e4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java
@@ -50,7 +50,7 @@ public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, R
public void materialsLoops() {
final Materials[] i = Materials.values();
final int size = i.length;
- Logger.INFO("Materials to attempt tool gen. with: " + size);
+ Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
int used = 0;
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
@@ -61,20 +61,20 @@ public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, R
&& (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE)) && (!aMaterial.contains(SubTag.MAGICAL))
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
- Logger.INFO("Generating Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Generating Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
// Input 1
final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
- //final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
+ final ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
- if ((null != plate /*&& longrod != null*/)) {
+ if ((null != plate && longrod != null)) {
addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1));
addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1));
addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
used++;
} else {
- Logger.INFO("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial)+", Plate or Long Rod may be invalid. Invalid | Plate? "+(plate == null) /*+" | Rod? "+(longrod == null)+" |"*/);
+ Logger.MATERIALS("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial)+", Plate or Long Rod may be invalid. Invalid | Plate? "+(plate == null) +" | Rod? "+(longrod == null)+" |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -83,10 +83,10 @@ public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, R
// Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
// Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
} else {
- Logger.INFO("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
}
} else {
- Logger.INFO("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial));
}
}
@@ -113,7 +113,7 @@ public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, R
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.INFO("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial)+", Durability: "+aDura);
+ Logger.MATERIALS("Unable to generate Angle Grinder from "+MaterialUtils.getMaterialName(aMaterial)+", Durability: "+aDura);
return false;
}
@@ -121,14 +121,15 @@ public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, R
aOutputStack,
RecipeBits.DISMANTLEABLE | RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | RecipeBits.BUFFERED,
new Object[]{
- "SXS",
+ "SXL",
"GMG",
"PBP",
'X', ItemList.Component_Grinder_Diamond.get(1),
'M', CI.getElectricMotor(aVoltageTier, 1),
'S', OrePrefixes.screw.get(Materials.Titanium),
+ 'L', OrePrefixes.stickLong.get(aMaterial),
'P', OrePrefixes.plate.get(aMaterial),
- 'G', OrePrefixes.gearGtSmall.get(Materials.Tungsten),
+ 'G', OrePrefixes.gearGtSmall.get(Materials.StainlessSteel),
'B', aBattery
});
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
index e64b580fd5..dbc2844875 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java
@@ -50,7 +50,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
public void materialsLoops() {
final Materials[] i = Materials.values();
final int size = i.length;
- Logger.INFO("Materials to attempt tool gen. with: " + size);
+ Logger.MATERIALS("Materials to attempt tool gen. with: " + size);
int used = 0;
Materials aMaterial = null;
for (int r = 0; r < size; r++) {
@@ -61,7 +61,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
&& (!aMaterial.contains(SubTag.NO_SMASHING)) && (!aMaterial.contains(SubTag.TRANSPARENT))
&& (!aMaterial.contains(SubTag.FLAMMABLE)) && (!aMaterial.contains(SubTag.MAGICAL))
&& (!aMaterial.contains(SubTag.NO_SMELTING))) {
- Logger.INFO("Generating Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Generating Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
// Input 1
@@ -73,7 +73,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1));
used++;
} else {
- Logger.INFO("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial)+", Plate or Long Rod may be invalid. Invalid | Plate? "+(plate == null) +" | Rod? "+" |");
+ Logger.MATERIALS("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial)+", Plate or Long Rod may be invalid. Invalid | Plate? "+(plate == null) +" | Rod? "+" |");
}
// GT_ModHandler.addCraftingRecipe(,
// GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS |
@@ -82,10 +82,10 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
// Character.valueOf('P'), OrePrefixes.plate.get(aMaterial),
// Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)});
} else {
- Logger.INFO("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
}
} else {
- Logger.INFO("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
+ Logger.MATERIALS("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial));
}
}
@@ -112,7 +112,7 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator,
long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack);
if (aDura <= 32000) {
- Logger.INFO("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial)+", Durability: "+aDura);
+ Logger.MATERIALS("Unable to generate Electric Snips from "+MaterialUtils.getMaterialName(aMaterial)+", Durability: "+aDura);
return false;
}