aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-27 17:29:51 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-27 17:29:51 +0100
commit919a75686d41ce274553b90352429e10db43007f (patch)
tree17851983fcda0a86d46c58140c2ce536517967dc /src/main/java/gregtech/api/util
parent3ee18ca5551f4bde620e79082b9854bfbf76ab83 (diff)
parenta6216b8cf0e514c6488aa5f0aff3a6998d8879f7 (diff)
downloadGT5-Unofficial-919a75686d41ce274553b90352429e10db43007f.tar.gz
GT5-Unofficial-919a75686d41ce274553b90352429e10db43007f.tar.bz2
GT5-Unofficial-919a75686d41ce274553b90352429e10db43007f.zip
Upadate with exp changes
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 34ef3d0963..55afca6174 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -860,10 +860,12 @@ public class GT_Utility {
return false;
}
}
+ ItemStack[] tStack = GT_OreDictUnificator.getStackArray(true, aOutput);
+ if(tStack==null||(tStack.length>0&&GT_Utility.areStacksEqual(aInput, tStack[0])))return false;
if (tOreName != null) {
- aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, GT_OreDictUnificator.getStackArray(true, aOutput)));
+ aRecipeList.put(new RecipeInputOreDict(tOreName.toString(), aInput.stackSize), new RecipeOutput(aNBT, tStack));
} else {
- aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, GT_OreDictUnificator.getStackArray(true, aOutput)));
+ aRecipeList.put(new RecipeInputItemStack(copy(aInput), aInput.stackSize), new RecipeOutput(aNBT, tStack));
}
return true;
}
@@ -1740,8 +1742,8 @@ public class GT_Utility {
FluidStack tFluid = getUndergroundOil(aWorld, aX, aZ);
tList.add("Oil in Chunk: " + tFluid.amount + " " + tFluid.getLocalizedName());
}
- if(aPlayer.capabilities.isCreativeMode){
- ChunkPosition tPos = new ChunkPosition(aX, aY, aZ);
+// if(aPlayer.capabilities.isCreativeMode){
+ ChunkPosition tPos = new ChunkPosition(aX/16, 1, aZ/16);
if(GT_Proxy.chunkData.containsKey(tPos)){
int[] tPollution = GT_Proxy.chunkData.get(tPos);
if(tPollution.length>1){
@@ -1750,7 +1752,7 @@ public class GT_Utility {
tList.add("No Pollution in Chunk");
}
}
- }
+// }
try {
if (tBlock instanceof IDebugableBlock) {