aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-10-05 12:31:58 +1000
committerAlkalus <draknyte1@hotmail.com>2017-10-05 12:31:58 +1000
commit3f9e9c961a2a6d20f0cf29d3516dd7fd64999a3d (patch)
tree11cd4aea8a4f544629b8688afb3d716b3da7bdb9 /src/Java/gtPlusPlus
parent6299f8b8496f3eeb9354161e1ead8ee457131e18 (diff)
downloadGT5-Unofficial-3f9e9c961a2a6d20f0cf29d3516dd7fd64999a3d.tar.gz
GT5-Unofficial-3f9e9c961a2a6d20f0cf29d3516dd7fd64999a3d.tar.bz2
GT5-Unofficial-3f9e9c961a2a6d20f0cf29d3516dd7fd64999a3d.zip
+ Added Macerator recipe for Chisel Limestone into 4x Calcite dust.
% Changed some logging messages.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java1
-rw-r--r--src/Java/gtPlusPlus/core/common/CommonProxy.java2
-rw-r--r--src/Java/gtPlusPlus/core/proxy/ClientProxy.java3
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java33
4 files changed, 24 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index aa9975404b..182953c947 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -247,6 +247,7 @@ public class GTplusplus implements ActionListener {
proxy.registerNetworkStuff();
//Set Variables for Fluorite Block handling
+ Utils.LOG_INFO("Setting some Variables for the block break event handler.");
BlockEventHandler.oreLimestone = OreDictionary.getOres("oreLimestone");
BlockEventHandler.blockLimestone = OreDictionary.getOres("limestone");
BlockEventHandler.fluoriteOre = ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockOreFluorite));
diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index 91077abbed..16c755b23d 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -37,7 +37,7 @@ public class CommonProxy {
Utils.LOG_INFO("We're using Gregtech 5.09 Experimental.");
}
else {
- Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork.");
+ Utils.LOG_INFO("We're using Gregtech 5.08 or an earlier fork.");
}
Utils.LOG_INFO("Setting up our own GT_Proxy.");
GtProxy = new Meta_GT_Proxy();
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 6af3174ef3..b7593246dc 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -170,7 +170,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
public void run() {
try {
if (CORE.mEnableCape){
- Utils.LOG_INFO("Skip: GT++ Mod: Downloading Cape List.");
+ Utils.LOG_INFO("GT++ Mod: Downloading Cape List.");
@SuppressWarnings("resource")
Scanner tScanner = new Scanner(new URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream());
while (tScanner.hasNextLine()) {
@@ -181,6 +181,7 @@ public class ClientProxy extends CommonProxy implements Runnable{
}
}
} catch (Throwable e) {
+ Utils.LOG_INFO("Failed to download GT++ cape list.");
}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c15b65631a..f627d28c00 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -173,19 +173,19 @@ public class RECIPES_GREGTECH {
120);
//HSS-G
- CORE.RA.addBlastSmelterRecipe(
- new ItemStack[]{
- ItemUtils.getGregtechCircuit(5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5),
- ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2),
- ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4),
- ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2)
- },
- FluidUtils.getFluidStack("molten.hssg", 18*144),
- 0,
- MathUtils.findPercentageOfInt(900*20, 80),
- 120);
+ CORE.RA.addBlastSmelterRecipe(
+ new ItemStack[]{
+ ItemUtils.getGregtechCircuit(5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustTungsten", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSteel", 5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustMolybdenum", 4),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustChrome", 2)
+ },
+ FluidUtils.getFluidStack("molten.hssg", 18*144),
+ 0,
+ MathUtils.findPercentageOfInt(900*20, 80),
+ 120);
//HSS-E
CORE.RA.addBlastSmelterRecipe(
@@ -908,6 +908,13 @@ public class RECIPES_GREGTECH {
GT_ModHandler.addPulverisationRecipe(
ItemUtils.getSimpleStack(Item.getItemFromBlock(ModBlocks.blockOreFluorite)),
ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 4));
+
+ if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null){
+ GT_ModHandler.addPulverisationRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCalcite", 4));
+ }
+
}
public static boolean addPulverisationRecipe(final ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, final ItemStack aOutput3) {