aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-10-11 21:10:47 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-10-11 21:10:47 +0200
commitd3f0b24afd94711786063bccaf7716c78402e8af (patch)
treeaca2964c88845e4f86b290cae107cad1b88b8a04 /src
parentfbf4c6b162fd752570b65a0f719c4b3b0b840858 (diff)
downloadGT5-Unofficial-d3f0b24afd94711786063bccaf7716c78402e8af.tar.gz
GT5-Unofficial-d3f0b24afd94711786063bccaf7716c78402e8af.tar.bz2
GT5-Unofficial-d3f0b24afd94711786063bccaf7716c78402e8af.zip
added TecTech handler
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 9d40a13aa3cef2a1e87521147628fa2487a2e13c
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java60
3 files changed, 66 insertions, 1 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index 35be05a86e..1f9968c9a3 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -31,6 +31,7 @@ import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import com.github.bartimaeusnek.bartworks.util.BWRecipes;
import com.github.bartimaeusnek.bartworks.util.BW_Util;
+import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
import gregtech.api.enums.*;
import gregtech.api.interfaces.ISubTagContainer;
@@ -282,7 +283,6 @@ public class RecipeLoader implements Runnable {
GT_Values.RA.addChemicalBathRecipe(new ItemStack(ItemRegistry.bw_glasses[0], 1, i), Materials.Chlorine.getGas(50), new ItemStack(ItemRegistry.bw_glasses[0], 1, 0), null, null, null, 64, 2);
}
-
GT_ModHandler.addCraftingRecipe(
new ItemStack(ItemRegistry.WINDMETER),
GT_ModHandler.RecipeBits.NOT_REMOVABLE,
@@ -758,6 +758,7 @@ public class RecipeLoader implements Runnable {
}
);
+ if (!Loader.isModLoaded("tectech"))
GT_Values.RA.addAssemblylineRecipe(
ItemList.Machine_Multi_ImplosionCompressor.get(1L),24000,
new ItemStack[]{
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
index dde15a6611..6c1b1bd175 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
@@ -27,6 +27,7 @@ import com.github.bartimaeusnek.bartworks.common.commands.ChangeConfig;
import com.github.bartimaeusnek.bartworks.common.commands.SummonRuin;
import com.github.bartimaeusnek.crossmod.GTpp.loader.RadioHatchCompat;
import com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy;
+import com.github.bartimaeusnek.crossmod.tectech.TecTechResearchLoader;
import com.github.bartimaeusnek.crossmod.thaumcraft.CustomAspects;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@@ -51,6 +52,7 @@ import java.io.StringReader;
+ "after:Micdoodlecore; "
+ "after:miscutils;"
+ "after:EMT;"
+ + "after:tectech;"
)
public class BartWorksCrossmod {
public static final String NAME = "BartWorks Mod Additions";
@@ -83,6 +85,8 @@ public class BartWorksCrossmod {
GalacticraftProxy.postInit(init);
if (Loader.isModLoaded("miscutils"))
new RadioHatchCompat().run();
+ if (Loader.isModLoaded("tectech"))
+ TecTechResearchLoader.runResearches();
}
// @Mod.EventHandler
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java
new file mode 100644
index 0000000000..ab17f787c9
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tectech/TecTechResearchLoader.java
@@ -0,0 +1,60 @@
+package com.github.bartimaeusnek.crossmod.tectech;
+
+import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
+import com.github.bartimaeusnek.bartworks.util.BW_Util;
+import com.github.technus.tectech.recipe.TT_recipeAdder;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraftforge.fluids.FluidStack;
+
+public class TecTechResearchLoader {
+
+ public static void runResearches(){
+
+ TT_recipeAdder.addResearchableAssemblylineRecipe(
+ ItemList.Machine_Multi_ImplosionCompressor.get(1L),
+ 64000,
+ 48,
+ BW_Util.getMachineVoltageFromTier(8),
+ 8,
+ new Object[]{
+ ItemList.Machine_Multi_ImplosionCompressor.get(1L),
+ Materials.Neutronium.getBlocks(5),
+ GT_OreDictUnificator.get(OrePrefixes.stickLong,Materials.Osmium,64),
+ GT_OreDictUnificator.get(OrePrefixes.ring,Materials.Osmium,64),
+ GT_OreDictUnificator.get(OrePrefixes.wireGt01,Materials.Superconductor,64),
+ ItemList.Electric_Piston_UV.get(64),
+ },
+ new FluidStack[]{
+ Materials.SolderingAlloy.getMolten(1440),
+ Materials.Osmium.getMolten(1440),
+ Materials.Neutronium.getMolten(1440)
+ },
+ ItemRegistry.eic.copy(),
+ 240000,
+ BW_Util.getMachineVoltageFromTier(8)
+ );
+
+// BartWorksCrossmod.LOGGER.info("Nerfing Assembly Lines >= LuV Recipes to run with TecTech!");
+// HashSet<GT_Recipe.GT_Recipe_AssemblyLine> toRem = new HashSet<>();
+// for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes){
+// if (recipe.mEUt >= BW_Util.getTierVoltage(6) && !GT_Utility.areStacksEqual(recipe.mResearchItem, CustomItemList.UnusedStuff.get(1L))){
+// String modId = GameRegistry.findUniqueIdentifierFor(recipe.mOutput.getItem()).modId;
+// if (!modId.equalsIgnoreCase("tectech"))
+// if (!modId.equalsIgnoreCase("gregtech") || modId.equalsIgnoreCase("gregtech") && (recipe.mOutput.getItemDamage() < 15000 || recipe.mOutput.getItemDamage() > 16999))
+// toRem.add(recipe);
+// }
+// }
+// HashSet<GT_Recipe> toRemVisual = new HashSet<>();
+// GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.removeAll(toRem);
+//
+// for (GT_Recipe.GT_Recipe_AssemblyLine recipe : toRem){
+// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.stream().filter(re -> GT_Utility.areStacksEqual(re.mOutputs[0],recipe.mOutput)).forEach(toRemVisual::add);
+// TT_recipeAdder.addResearchableAssemblylineRecipe(recipe.mResearchItem, recipe.mResearchTime, recipe.mResearchTime/1000, recipe.mEUt, GT_Utility.getTier(recipe.mEUt)-2, recipe.mInputs, recipe.mFluidInputs, recipe.mOutput, recipe.mDuration, recipe.mEUt);
+// }
+//
+// GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.mRecipeList.removeAll(toRemVisual);
+ }
+}