aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-29 18:58:42 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-29 18:58:42 +1000
commit8fb534cda0f292f90eb3b9325ddfbbc0e145f561 (patch)
tree53d6d12f30816b8427709031356265d07a9d4fbc /src
parent10974e7952ad9853c63bcbbb5a83952f97b2bbb1 (diff)
downloadGT5-Unofficial-8fb534cda0f292f90eb3b9325ddfbbc0e145f561.tar.gz
GT5-Unofficial-8fb534cda0f292f90eb3b9325ddfbbc0e145f561.tar.bz2
GT5-Unofficial-8fb534cda0f292f90eb3b9325ddfbbc0e145f561.zip
+ Added a missing @Side annotation.
$ Fixed some recipes in the Blast Smelter that only required circuits.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/util/player/PlayerUtils.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
index 132bfe12ce..e1d5a4b311 100644
--- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
@@ -111,6 +111,7 @@ public class PlayerUtils {
return null;
}
+ @SideOnly(Side.CLIENT)
public static Item getItemInPlayersHand(){
Minecraft mc = Minecraft.getMinecraft();
Item heldItem = null;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index fec7fade67..42f3829045 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -78,9 +78,11 @@ public class RecipeGen_BlastSmelter implements Runnable{
if (tItemStackTest[das] != null)
Utils.LOG_WARNING("tMaterial["+das+"]: "+tItemStackTest[das].getDisplayName()+" Meta: "+tItemStackTest[das].getItemDamage()+", Amount: "+tItemStackTest[das].stackSize);
}
+
+ boolean hasMoreInputThanACircuit = (tItemStackTest.length > 1);
//Generate Recipes for all singular materials that can be made molten.
- if (mMaterialListSize >= 1){
+ if (hasMoreInputThanACircuit){
if (M.requiresBlastFurnace()) {
if (CORE.RA.addBlastSmelterRecipe(tItemStackTest, M.getFluid(fluidAmount), 100, duration, 240)){
Utils.LOG_WARNING("Success.");