aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gradle/3.2.1/taskArtifacts/fileHashes.binbin441391 -> 0 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/fileSnapshots.binbin9294227 -> 0 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/taskArtifacts.binbin76573 -> 0 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/taskArtifacts.lockbin17 -> 0 bytes
-rw-r--r--.gradle/gradle.log27
-rw-r--r--Recommended.txt2
-rw-r--r--build.gradle2
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java102
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java58
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java21
-rw-r--r--src/resources/mcmod.info2
12 files changed, 131 insertions, 85 deletions
diff --git a/.gradle/3.2.1/taskArtifacts/fileHashes.bin b/.gradle/3.2.1/taskArtifacts/fileHashes.bin
deleted file mode 100644
index 371cf8d9c3..0000000000
--- a/.gradle/3.2.1/taskArtifacts/fileHashes.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index 43e870401e..0000000000
--- a/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index b54a1d2bac..0000000000
--- a/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin
+++ /dev/null
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock b/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock
deleted file mode 100644
index 3002f29b85..0000000000
--- a/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock
+++ /dev/null
Binary files differ
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
deleted file mode 100644
index b66ee14430..0000000000
--- a/.gradle/gradle.log
+++ /dev/null
@@ -1,27 +0,0 @@
-:compileApiJava UP-TO-DATE
-:processApiResources UP-TO-DATE
-:apiClasses UP-TO-DATE
-:sourceMainJava UP-TO-DATE
-:compileJava UP-TO-DATE
-:processResources UP-TO-DATE
-:classes UP-TO-DATE
-:devJar UP-TO-DATE
-:jar
-:compileTestJava UP-TO-DATE
-:processTestResources UP-TO-DATE
-:testClasses UP-TO-DATE
-:test UP-TO-DATE
-:extractMcpData UP-TO-DATE
-:getVersionJson
-:extractUserDev UP-TO-DATE
-:genSrgs SKIPPED
-:reobf
-:sourceJar UP-TO-DATE
-:assemble
-:check UP-TO-DATE
-:build
-:gitChangelogTask
-
-BUILD SUCCESSFUL
-
-Total time: 17.083 secs
diff --git a/Recommended.txt b/Recommended.txt
index 3ab0915bac..081af9a10f 100644
--- a/Recommended.txt
+++ b/Recommended.txt
@@ -1 +1 @@
-1.7.0-prerelease-10-final \ No newline at end of file
+1.7.1 \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 286309d2c7..8bd01251e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,7 +52,7 @@ targetCompatibility = JavaVersion.VERSION_1_8
//Jar Info
archivesBaseName = "GT-PlusPlus"
-version = "1.7.0-prerelease-20-hotfix"
+version = "1.7.1"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
minecraft {
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 540f4db79a..4d7643e0b0 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -187,15 +187,55 @@ public class GTplusplus implements ActionListener {
* @param event - The {@link EventHandler} object passed through from FML to {@link #GTplusplus()}'s {@link #instance}.
*/
@Mod.EventHandler
- public void onLoadComplete(FMLLoadCompleteEvent event) {
+ public void onLoadComplete(FMLLoadCompleteEvent event) {
+ tryPatchTurbineTextures();
+ generateGregtechRecipeMaps();
+ }
+
+ public static void tryPatchTurbineTextures() {
+ if (enableAnimatedTurbines) {
+ BlockIcons h = Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE;
+ BlockIcons h2 = Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE;
+ try {
+ Logger.INFO("Trying to patch GT textures to make Turbines animated.");
+ IIcon aIcon = TexturesGtBlock.Overlay_Machine_Turbine_Active.getIcon();
+ //IIcon aOverlay = TexturesGtBlock.Overlay_Machine_Turbine_Active.getOverlayIcon();
+ if (ReflectionUtils.setField(h, "mIcon", aIcon)) {
+ Logger.INFO("Patched Gas Turbine Icon.");
+ /*if (ReflectionUtils.setField(h, "mOverlay", aOverlay)) {
+ Logger.INFO("Patched Gas Turbine Overlay Icon.");
+ }*/
+ }
+ if (ReflectionUtils.setField(h2, "mIcon", aIcon)) {
+ Logger.INFO("Patched Steam Turbine Icon.");
+ /*if (ReflectionUtils.setField(h2, "mOverlay", aOverlay)) {
+ Logger.INFO("Patched Steam Turbine Overlay Icon.");
+ }*/
+ }
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ protected void generateGregtechRecipeMaps() {
+
+ int[] mValidCount = new int[] {0, 0, 0};
+ int[] mInvalidCount = new int[] {0, 0, 0};
+ int[] mOriginalCount = new int[] {0, 0, 0};
+
RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList();
FishPondFakeRecipe.generateFishPondRecipes();
//Large Centrifuge generation
+ mOriginalCount[0] = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.size();
for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList) {
if (x != null) {
- if (ItemUtils.checkForInvalidItems(x.mInputs)) {
- CORE.RA.addMultiblockCentrifugeRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue);
+ if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
+ if (CORE.RA.addMultiblockCentrifugeRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
+ mValidCount[0]++;
+ }
}
else {
Logger.INFO("[Recipe] Error generating Large Centrifuge recipe.");
@@ -205,13 +245,19 @@ public class GTplusplus implements ActionListener {
Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs));
}
}
+ else {
+ mInvalidCount[0]++;
+ }
}
//Large Electrolyzer generation
+ mOriginalCount[1] = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList.size();
for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList) {
if (x != null) {
- if (ItemUtils.checkForInvalidItems(x.mInputs)) {
- CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue);
+ if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
+ if (CORE.RA.addMultiblockElectrolyzerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
+ mValidCount[1]++;
+ }
}
else {
Logger.INFO("[Recipe] Error generating Large Electrolyzer recipe.");
@@ -221,9 +267,13 @@ public class GTplusplus implements ActionListener {
Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(x.mFluidOutputs));
}
}
+ else {
+ mInvalidCount[1]++;
+ }
}
//Advanced Vacuum Freezer generation
+ mOriginalCount[2] = GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList.size();
for (GT_Recipe x : GT_Recipe.GT_Recipe_Map.sVacuumRecipes.mRecipeList) {
if (x != null && RecipeUtils.doesGregtechRecipeHaveEqualCells(x)) {
int mTime = (x.mDuration/2);
@@ -238,42 +288,20 @@ public class GTplusplus implements ActionListener {
mr3++;
}
y[slot] = FluidUtils.getFluidStack("cryotheum", mTime);
- if (ItemUtils.checkForInvalidItems(x.mInputs)) {
- CORE.RA.addAdvancedFreezerRecipe(x.mInputs, y, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue);
- }
- }
- }
-
- Logger.INFO("[Bedrock Miner] Initial OreType Scan");
- MiningUtils.iterateAllOreTypes();
- tryPatchTurbineTextures();
- }
-
- public static void tryPatchTurbineTextures() {
- if (enableAnimatedTurbines) {
- BlockIcons h = Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE;
- BlockIcons h2 = Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE;
- try {
- Logger.INFO("Trying to patch GT textures to make Turbines animated.");
- IIcon aIcon = TexturesGtBlock.Overlay_Machine_Turbine_Active.getIcon();
- //IIcon aOverlay = TexturesGtBlock.Overlay_Machine_Turbine_Active.getOverlayIcon();
- if (ReflectionUtils.setField(h, "mIcon", aIcon)) {
- Logger.INFO("Patched Gas Turbine Icon.");
- /*if (ReflectionUtils.setField(h, "mOverlay", aOverlay)) {
- Logger.INFO("Patched Gas Turbine Overlay Icon.");
- }*/
- }
- if (ReflectionUtils.setField(h2, "mIcon", aIcon)) {
- Logger.INFO("Patched Steam Turbine Icon.");
- /*if (ReflectionUtils.setField(h2, "mOverlay", aOverlay)) {
- Logger.INFO("Patched Steam Turbine Overlay Icon.");
- }*/
+ if (ItemUtils.checkForInvalidItems(x.mInputs, x.mOutputs)) {
+ if (CORE.RA.addAdvancedFreezerRecipe(x.mInputs, y, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue)) {
+ mValidCount[2]++;
+ }
}
}
- catch (Throwable e) {
- e.printStackTrace();
+ else {
+ mInvalidCount[2]++;
}
}
+ String[] machineName = new String[] {"Centrifuge", "Electrolyzer", "Vacuum Freezer"};
+ for (int i=0;i<3;i++) {
+ Logger.INFO("[Recipe] Generated "+mValidCount[i]+" recipes for the Industrial "+machineName+". The original machine can process "+mOriginalCount[i]+" recipes, meaning "+mInvalidCount[i]+" are invalid for this Multiblock's processing in some way.");
+ }
}
protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
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;
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
index 05861d2525..f0cdc61a68 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java
@@ -502,7 +502,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
- if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+ if (!ItemUtils.checkForInvalidItems(aInputs, aOutputs)) {
+ Logger.INFO("[Recipe] Error generating Large Centrifuge recipe.");
+ Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(aInputs));
+ Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(aFluidInputs));
+ Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(aOutputs));
+ Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(aFluidOutputs));
return false;
}
Recipe_GT.Gregtech_Recipe_Map.sMultiblockCentrifugeRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
@@ -513,7 +518,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
if (areItemsAndFluidsBothNull(aInputs, aFluidInputs) || areItemsAndFluidsBothNull(aOutputs, aFluidOutputs) || aEUtick <= 0) {
return false;
}
- if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+ if (!ItemUtils.checkForInvalidItems(aInputs, aOutputs)) {
+ Logger.INFO("[Recipe] Error generating Large Electrolyzer recipe.");
+ Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(aInputs));
+ Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(aFluidInputs));
+ Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(aOutputs));
+ Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(aFluidOutputs));
return false;
}
Recipe_GT.Gregtech_Recipe_Map.sMultiblockElectrolyzerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial);
@@ -526,7 +536,12 @@ public class GregtechRecipeAdder implements IGregtech_RecipeAdder {
return false;
}
- if (!ItemUtils.checkForInvalidItems(aInputs) || !ItemUtils.checkForInvalidItems(aOutputs)) {
+ if (!ItemUtils.checkForInvalidItems(aInputs, aOutputs)) {
+ Logger.INFO("[Recipe] Error generating Adv. Vac Freezer recipe.");
+ Logger.INFO("Inputs: "+ItemUtils.getArrayStackNames(aInputs));
+ Logger.INFO("Fluid Inputs: "+ItemUtils.getArrayStackNames(aFluidInputs));
+ Logger.INFO("Outputs: "+ItemUtils.getArrayStackNames(aOutputs));
+ Logger.INFO("Fluid Outputs: "+ItemUtils.getArrayStackNames(aFluidOutputs));
return false;
}
if (Recipe_GT.Gregtech_Recipe_Map.sAdvFreezerRecipes.addRecipe(true, aInputs, aOutputs, null, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUtick, aSpecial) != null) {
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 50f5b726b4..4e306cd68f 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds over 100 new Multiblocks, Machines, etc to Gregtech.",
"credits": "",
"logoFile": "",
- "version": "1.7.0-prerelease-20",
+ "version": "1.7.1",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/GTplusplus/wiki",
"updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",
generated by cgit (git 2.46.0) at 2025-03-09 05:54:40 +0000