aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-22 13:23:21 +0100
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-10-22 13:23:21 +0100
commit9dfe88fb1a39b03bcd418409692938cb4ff557f1 (patch)
tree36ba6668d9a92339bf83a0dccc6ec09a7ab75979 /src/Java/gtPlusPlus/xmod/gregtech/loaders
parentf53caf47183769b5c39f65c3715715889db11718 (diff)
downloadGT5-Unofficial-9dfe88fb1a39b03bcd418409692938cb4ff557f1.tar.gz
GT5-Unofficial-9dfe88fb1a39b03bcd418409692938cb4ff557f1.tar.bz2
GT5-Unofficial-9dfe88fb1a39b03bcd418409692938cb4ff557f1.zip
+ Added tiered Control Cores for all Multiblocks, which are now required to run.
+ Added new Bus for Control Cores. $ Added packager recipes for all small/tiny dusts, Closes #395. $ Increased amount of Cryotheum gained from Fluid Extraction to be inline with Pyrotheum. Closes #390.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java25
1 files changed, 24 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 1875e874ea..49407f843c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -6,10 +6,14 @@ import java.util.Set;
import net.minecraft.item.ItemStack;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
-
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.interfaces.RunnableWithInfo;
import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.material.MaterialGenerator;
import gtPlusPlus.core.material.MaterialStack;
@@ -110,6 +114,10 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (materialFrameBox != null) {
GT_ModHandler.addPulverisationRecipe(materialFrameBox, material.getDust(2));
}
+
+ if (smallDust != null && tinyDust != null) {
+ generatePackagerRecipes(material);
+ }
//Is this a composite?
if ((inputStacks != null) && !disableOptional){
@@ -308,5 +316,20 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
return false;
}
+ public static boolean generatePackagerRecipes(Material aMatInfo) {
+ AutoMap<Boolean> aResults = new AutoMap<Boolean>();
+ //Small Dust
+ aResults.put(GT_Values.RA.addBoxingRecipe(GT_Utility.copyAmount(4L, new Object[]{aMatInfo.getSmallDust(4)}), ItemList.Schematic_Dust.get(0L, new Object[0]), aMatInfo.getDust(1), 100, 4));
+ //Tiny Dust
+ aResults.put(GT_Values.RA.addBoxingRecipe(GT_Utility.copyAmount(9L, new Object[]{aMatInfo.getTinyDust(9)}), ItemList.Schematic_Dust.get(0L, new Object[0]), aMatInfo.getDust(1), 100, 4));
+
+ for (boolean b : aResults) {
+ if (!b) {
+ return false;
+ }
+ }
+ return true;
+ }
+
}