aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-15 16:25:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-15 16:25:47 +1000
commitf255d45f8f652f50e56fe1a21e85740a49cb3153 (patch)
treeb9d46c15430e77b2a951fedef8c1f17e10a2afb0 /src
parent91853a0b54c1ad8f1cee031def51c3d8b96e0ad6 (diff)
downloadGT5-Unofficial-f255d45f8f652f50e56fe1a21e85740a49cb3153.tar.gz
GT5-Unofficial-f255d45f8f652f50e56fe1a21e85740a49cb3153.tar.bz2
GT5-Unofficial-f255d45f8f652f50e56fe1a21e85740a49cb3153.zip
$ Fixed a strange texture loading issue, now there's a segment dedicated to CustimIcons in preInit.
% Changed Skookum Choocher recipe to now use a stickLong, instead of two ingots.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java5
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 05f119d586..caa293fbed 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -99,7 +99,7 @@ implements ActionListener
String infusedDust3 = "dustInfused"+infusedDusts[c];
String infusedDust4 = "dustInfused"+infusedDusts[d];
Utils.LOG_INFO("Found the aspect of "+infusedDusts[a]+" to embody into energy crystals.");
- Utils.LOG_INFO("Found the aspect of "+infusedDusts[b]+" to embody into energy crystals.");
+ Utils.LOG_INFO("Found the aspect of "+infusedDusts[b]+" to embody into eshonergy crystals.");
Utils.LOG_INFO("Found the aspect of "+infusedDusts[c]+" to embody into energy crystals.");
Utils.LOG_INFO("Found the aspect of "+infusedDusts[d]+" to embody into energy crystals.");
randomDust_A = infusedDust1;
@@ -109,7 +109,12 @@ implements ActionListener
//ItemStack a1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[a], 8);
//ItemStack b1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[b], 8);
//ItemStack c1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[c], 8);
- //ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8);
+ //ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8);
+
+
+ //Do this weird things for textures.
+ Utils.LOG_WARNING("Processing texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
+
}
@@ -121,7 +126,6 @@ implements ActionListener
public void preInit(FMLPreInitializationEvent event)
{
Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION);
- Utils.LOG_INFO("Test String for Debug: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
Utils.LOG_INFO("Latest is V"+CORE.MASTER_VERSION+". Updated? "+Utils.isModUpToDate());
FirstCall();
FMLCommonHandler.instance().bus().register(new LoginEventHandler());
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
index 534fb73945..6bf61bb6bb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingToolHeadChoocher.java
@@ -50,13 +50,14 @@ public class ProcessingToolHeadChoocher implements Interface_OreRecipeRegistrato
//Input 1
ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L);
ItemStack ingot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L);
+ ItemStack longrod = GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L);
ItemStack hammerhead = GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L);
- if (null != plate && null != ingot && null != hammerhead){
+ if (null != plate && null != ingot && null != hammerhead && null != longrod){
UtilsRecipe.recipeBuilder(
plate, null, hammerhead,
plate, plate, ingot,
- null, ingot, null,
+ null, null, longrod,
MetaGeneratedGregtechTools.INSTANCE.getToolWithStats(MetaGeneratedGregtechTools.SKOOKUM_CHOOCHER, 1, aMaterial, null, null));
used++;
}