aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/plugin
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-26 01:44:42 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-26 01:44:42 +0100
commit26bd0dc2c5f68ff9402c428cce8b8936880ae7a4 (patch)
tree220aaaaf8214bd6203479f8ecb7a712b16d02198 /src/Java/gtPlusPlus/plugin
parentb9ad7d46f1f1993add94ad7b561e1fea94a4e0d1 (diff)
downloadGT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.tar.gz
GT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.tar.bz2
GT5-Unofficial-26bd0dc2c5f68ff9402c428cce8b8936880ae7a4.zip
% More .08 Compatibility.
Diffstat (limited to 'src/Java/gtPlusPlus/plugin')
-rw-r--r--src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java b/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
index c125e26016..92dae4e913 100644
--- a/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
+++ b/src/Java/gtPlusPlus/plugin/sulfurchem/Core_SulfuricChemistry.java
@@ -11,6 +11,7 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import gtPlusPlus.plugin.manager.Core_Manager;
+import gtPlusPlus.xmod.gregtech.common.StaticFields59;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -97,7 +98,7 @@ public class Core_SulfuricChemistry implements IPlugin {
* Sulfur Trioxide Recipes
*/
//Air
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict(catalyst, 0),
ItemUtils.getItemStackOfAmountFromOreDict("cellAir", 1),
FluidUtils.getFluidStack("sulfurdioxide", 3000),
@@ -108,7 +109,7 @@ public class Core_SulfuricChemistry implements IPlugin {
16)) {
mCountAdded++;
}
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict(catalyst, 0),
ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurDioxide", 3),
FluidUtils.getFluidStack("air", 1000),
@@ -120,7 +121,7 @@ public class Core_SulfuricChemistry implements IPlugin {
mCountAdded++;
}
//Oxygen
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict(catalyst, 0),
ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
FluidUtils.getFluidStack("sulfurdioxide", 3000),
@@ -131,7 +132,7 @@ public class Core_SulfuricChemistry implements IPlugin {
16)) {
mCountAdded++;
}
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict(catalyst, 0),
ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurDioxide", 3),
FluidUtils.getFluidStack("oxygen", 1000),
@@ -147,7 +148,7 @@ public class Core_SulfuricChemistry implements IPlugin {
* Sulfuric Acid Recipes
*/
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
CI.getNumberedCircuit(22),
ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1),
FluidUtils.getFluidStack("water", 750),
@@ -158,7 +159,7 @@ public class Core_SulfuricChemistry implements IPlugin {
20)) {
mCountAdded++;
}
- if (GT_Values.RA.addChemicalRecipe(
+ if (CORE.RA.addChemicalRecipe(
CI.getNumberedCircuit(22),
ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 3),
FluidUtils.getFluidStack("sulfurtrioxide", 4000),
@@ -204,7 +205,8 @@ public class Core_SulfuricChemistry implements IPlugin {
}
//Multi Block Recipes
- recipe : for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList) {
+ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+ recipe : for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfurTrioxide", 1))) {
@@ -228,6 +230,7 @@ public class Core_SulfuricChemistry implements IPlugin {
continue;
}
}
+ }
return mDisabled;
}
@@ -263,7 +266,8 @@ public class Core_SulfuricChemistry implements IPlugin {
}
//Multi Block Recipes
- recipe : for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes.mRecipeList) {
+ if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
+ recipe : for (GT_Recipe r : StaticFields59.getLargeChemicalReactorRecipeMap().mRecipeList) {
for (ItemStack i : r.mOutputs) {
i.stackSize = 1;
if (ItemStack.areItemStacksEqual(i, ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricAcid", 1))) {
@@ -287,6 +291,7 @@ public class Core_SulfuricChemistry implements IPlugin {
continue;
}
}
+ }
return mDisabled;
}