diff options
| -rw-r--r-- | build.properties | 4 | ||||
| -rw-r--r-- | libs/GT-PlusPlus-1.6.02-release-dev.jar (renamed from libs/GT-PlusPlus-1.5.6-Pre-release.jar) | bin | 2921830 -> 2914991 bytes | |||
| -rw-r--r-- | libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar (renamed from libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar) | bin | 3287958 -> 3287712 bytes | |||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java | 18 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/loader/RecipeLoader.java | 17 |
5 files changed, 27 insertions, 12 deletions
diff --git a/build.properties b/build.properties index 94fb5918d1..0635e9681a 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=786 -gregtech.version=5.09.32.00 +gregtech.jenkinsbuild=851 +gregtech.version=5.09.32.04 cofhcore.cf=2246/920 cofhcore.version=[1.7.10]3.0.3-303-dev cofhlib.cf=2246/918 diff --git a/libs/GT-PlusPlus-1.5.6-Pre-release.jar b/libs/GT-PlusPlus-1.6.02-release-dev.jar Binary files differindex 13ae18b160..82ff78add3 100644 --- a/libs/GT-PlusPlus-1.5.6-Pre-release.jar +++ b/libs/GT-PlusPlus-1.6.02-release-dev.jar diff --git a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar Binary files differindex d2f6c79715..09bcdc7dae 100644 --- a/libs/GTNewHorizonsCoreMod-1.7.10-1.5.7.jar +++ b/libs/GTNewHorizonsCoreMod-1.7.10-1.5.8 (1).jar diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java index 52153a96f1..06e6d472af 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java @@ -24,7 +24,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Containment.get(1, o), GT_ModHandler.getIC2Item("reinforcedGlass", 1L) - }, Materials.Trinium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000, true); + }, Materials.Trinium.getMolten(576), new ItemStack(QuantumGlassBlock.INSTANCE, 1), 200, 500000); //BLUEprint GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1), @@ -52,7 +52,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1, o), 100, 30720, true); + }, Materials.TungstenSteel.getMolten(576), CustomItemList.eM_Power.get(1, o), 100, 30720); //Computer Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -60,7 +60,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2) - }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1, o), 200, 122880, true); + }, Materials.Aluminium.getMolten(1296), CustomItemList.eM_Computer_Casing.get(1, o), 200, 122880); //Computer Vent Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), @@ -69,7 +69,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 1) - }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1, o), 100, 1920, true); + }, Materials.SolderingAlloy.getMolten(1296), CustomItemList.eM_Computer_Vent.get(1, o), 100, 1920); //Advanced Computer Casing GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1, o), @@ -87,7 +87,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TungstenSteel, 24), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.TungstenSteel, 24), ItemList.Field_Generator_IV.get(1, o) - }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1, o), 800, 500000, true); + }, Materials.Osmium.getMolten(1296), CustomItemList.eM_Containment.get(1, o), 800, 500000); //endregion @@ -175,7 +175,7 @@ public class DreamCraftRecipeLoader implements Runnable { CustomItemList.DATApipe.get(4, o), ItemList.Cover_Screen.get(1, o ), new ItemStack(Blocks.stone_button, 16), - }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1, o), 800, 122880, true); + }, Materials.Iridium.getMolten(2592), CustomItemList.Parametrizer_Hatch.get(1, o), 800, 122880); //Uncertainty GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ CustomItemList.eM_Computer_Casing.get(1, o), @@ -219,7 +219,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), ItemList.Upgrade_Overclocker.get(4, o), - }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 800, 480, true); + }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_Microwave.get(1, o), 800, 480); //Active Transformer GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -227,7 +227,7 @@ public class DreamCraftRecipeLoader implements Runnable { com.dreammaster.gthandler.CustomItemList.HighEnergyFlowCircuit.get(1, o), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16), ItemList.Circuit_Chip_UHPIC.get(2, o), - }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1, o), 400, 30720, true); + }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1, o), 400, 30720); //Network Switch GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -236,7 +236,7 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), CustomItemList.DATApipe.get(4, o), - }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1, o), 800, 122880, true); + }, Materials.Iridium.getMolten(1296), CustomItemList.Machine_Multi_Switch.get(1, o), 800, 122880); //Quantum Computer GT_Values.RA.addAssemblylineRecipe(ItemList.Tool_DataOrb.get(1), 20000, new ItemStack[]{ diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java index 5c32328889..aab236b7dc 100644 --- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java @@ -2,7 +2,17 @@ package com.github.technus.tectech.loader; import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader; import com.github.technus.tectech.elementalMatter.definitions.complex.dAtomDefinition; +import com.github.technus.tectech.thing.block.QuantumGlassBlock; +import com.github.technus.tectech.thing.casing.GT_Block_HintTT; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; import cpw.mods.fml.common.Loader; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import net.minecraft.item.ItemStack; + +import static gregtech.api.enums.GT_Values.RA; /** * Created by danie_000 on 16.11.2016. @@ -15,7 +25,12 @@ public class RecipeLoader implements Runnable { // Recipes init - common goes here rest goes into methods below // =================================================================================================== - + for(int i=0;i<=15;i++) + RA.addAssemblerRecipe(new ItemStack[]{ + GT_Utility.getIntegratedCircuit(i), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Cobalt,1)}, + Materials.Aluminium.getMolten(864), + new ItemStack(TT_Container_Casings.sHintCasingsTT, 1,i),32,120); if (Loader.isModLoaded("dreamcraft")) new DreamCraftRecipeLoader().run();//TODO init recipes for GTNH version else new BloodyRecipeLoader().run();//TODO init recipes for NON-GTNH version |