aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-28 18:00:05 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-05-28 18:00:05 +1000
commit8648abc4e1da4ec510b3fb6f8ae00ffc9560abba (patch)
treeee7808fb49e770e600a4576bf91569f25a552621 /src/Java/gtPlusPlus/core
parenta05f4d0e9322215ecb5efdd8ccf78262cb2c6c58 (diff)
downloadGT5-Unofficial-8648abc4e1da4ec510b3fb6f8ae00ffc9560abba.tar.gz
GT5-Unofficial-8648abc4e1da4ec510b3fb6f8ae00ffc9560abba.tar.bz2
GT5-Unofficial-8648abc4e1da4ec510b3fb6f8ae00ffc9560abba.zip
^ Version bump to v1.7.1.
^ Updated Recommended.txt to v1.7.1. $ Fixed not all Multiblock recipes generating. There's < 10 missing per machine. Adding some logging to fine tooth which ones break and why. - Removed Gradle files.
Diffstat (limited to 'src/Java/gtPlusPlus/core')
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java58
2 files changed, 45 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index cb14abf8db..f4a36604ed 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -53,7 +53,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.7.0-prerelease-20";
+ public static final String VERSION = "1.7.1";
public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
public static boolean isModUpToDate = Utils.isModUpToDate();
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 9eff8d1183..56707db32b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -800,23 +800,32 @@ public class ItemUtils {
return checkForInvalidItems(new ItemStack[] {mInput});
}
+ public static boolean checkForInvalidItems(ItemStack[] mInput) {
+ return checkForInvalidItems(mInput, new ItemStack[] {});
+ }
+
/**
*
* @param mInputs
* @return {@link Boolean} - True if {@link ItemStack}[] only contains valid items.
*/
- public static boolean checkForInvalidItems(ItemStack[] mInputs) {
- if (mInputs == null || mInputs.length == 0) {
+ public static boolean checkForInvalidItems(ItemStack[] mInputs, ItemStack[] mOutputs) {
+ if (mInputs == null || mOutputs == null) {
return false;
- }
- for (ItemStack stack : mInputs) {
- if (stack != null) {
- if (stack.getItem() != null) {
- if (stack.getItem() == ModItems.AAA_Broken || stack.getItem().getClass() == ModItems.AAA_Broken.getClass()){
- return false;
- }
- else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem().getClass() == ModItems.ZZZ_Empty.getClass()){
- return false;
+ }
+ if (mInputs.length > 0) {
+ for (ItemStack stack : mInputs) {
+ if (stack != null) {
+ if (stack.getItem() != null) {
+ if (stack.getItem() == ModItems.AAA_Broken || stack.getItem().getClass() == ModItems.AAA_Broken.getClass()){
+ return false;
+ }
+ else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem().getClass() == ModItems.ZZZ_Empty.getClass()){
+ return false;
+ }
+ else {
+ continue;
+ }
}
else {
continue;
@@ -826,10 +835,31 @@ public class ItemUtils {
continue;
}
}
- else {
- continue;
- }
}
+ if (mOutputs.length > 0) {
+ for (ItemStack stack : mOutputs) {
+ if (stack != null) {
+ if (stack.getItem() != null) {
+ if (stack.getItem() == ModItems.AAA_Broken || stack.getItem().getClass() == ModItems.AAA_Broken.getClass()){
+ return false;
+ }
+ else if (stack.getItem() == ModItems.ZZZ_Empty || stack.getItem().getClass() == ModItems.ZZZ_Empty.getClass()){
+ return false;
+ }
+ else {
+ continue;
+ }
+ }
+ else {
+ continue;
+ }
+ }
+ else {
+ continue;
+ }
+ }
+ }
+
return true;
}