diff options
author | Bass <tudurap.com@gmail.com> | 2019-08-23 10:41:54 +0100 |
---|---|---|
committer | Bass <tudurap.com@gmail.com> | 2019-08-23 10:41:54 +0100 |
commit | 306459bc9ee83725dbcc408c7ef9b4ab69dbc5dd (patch) | |
tree | 31bd1a6061c37353fab3b199e2a3ec6c044836ae /src/main/java/com | |
parent | 635e177d06c3b4d50e46978bc8ff30dcd8c3cd4f (diff) | |
download | GT5-Unofficial-306459bc9ee83725dbcc408c7ef9b4ab69dbc5dd.tar.gz GT5-Unofficial-306459bc9ee83725dbcc408c7ef9b4ab69dbc5dd.tar.bz2 GT5-Unofficial-306459bc9ee83725dbcc408c7ef9b4ab69dbc5dd.zip |
Recipes & Refactors
Refactors to match GT5u Naming conventions
Recipes for Tesla transceivers
Diffstat (limited to 'src/main/java/com')
5 files changed, 767 insertions, 40 deletions
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 d51f317975..c4f39373f0 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 @@ -475,13 +475,7 @@ public class DreamCraftRecipeLoader implements Runnable { //endregion - //region multi blocks - - //Tesla Winding Components (ADD BLOOD VARIANT) - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), - }, Materials.Epoxid.getMolten(18), CustomItemList.teslaComponent.getWithDamage(1,0), 320, 30); + //region multiblocks //Tesla Winding Components Ultimate (ADD BLOOD VARIANT) GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -489,14 +483,14 @@ public class DreamCraftRecipeLoader implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 1), }, Materials.Polytetrafluoroethylene.getMolten(18), CustomItemList.teslaComponent.getWithDamage(1,1), 320, 7680); - //Tesla Coil (ADD BLOOD VARIANT) + //Tesla Coil GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ - CustomItemList.tM_TeslaSecondary.get(6), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), + GT_ModHandler.getIC2Item("teslaCoil", 1), + CustomItemList.tM_TeslaSecondary.get(4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), ItemList.Upgrade_Overclocker.get(4), - }, Materials.Copper.getMolten(576), CustomItemList.Machine_Multi_TeslaCoil.get(1), 800, 480); + }, Materials.Silver.getMolten(576), CustomItemList.Machine_Multi_TeslaCoil.get(1), 800, 480); //Microwave Grinder GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ @@ -1171,6 +1165,360 @@ public class DreamCraftRecipeLoader implements Runnable { } //endregion + //region singleblocks + + //Tesla Transceiver LV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + + //Tesla Transceiver MV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + + //Tesla Transceiver HV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + + //Tesla Transceiver EV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + + //Tesla Transceiver MV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + + //Tesla Transceiver HV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + + //Tesla Transceiver EV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + + //Tesla Transceiver MV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + + //Tesla Transceiver HV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + + //Tesla Transceiver EV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + + //Tesla Transceiver MV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + + //Tesla Transceiver HV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + + //Tesla Transceiver EV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + + //endregion + + //region crafting components + + //Tesla Winding Components + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), + }, Materials.Epoxid.getMolten(288), CustomItemList.teslaComponent.getWithDamage(1,0), 320, 30); + + //endregion + register_machine_EM_behaviours(); } diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java index 02dc1a794e..7eb46d0551 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java @@ -598,9 +598,18 @@ public class BloodyRecipeLoader implements Runnable { }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1), 800, 500000); //endregion - + //region multiblocks + //Tesla Coil + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + GT_ModHandler.getIC2Item("teslaCoil", 1), + CustomItemList.tM_TeslaSecondary.get(4), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + ItemList.Upgrade_Overclocker.get(4), + }, Materials.Silver.getMolten(576), CustomItemList.Machine_Multi_TeslaCoil.get(1), 800, 480); + //Microwave Grinder GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ ItemList.Machine_HV_Microwave.get(1), @@ -767,6 +776,360 @@ public class BloodyRecipeLoader implements Runnable { //endregion + //region singleblocks + + //Tesla Transceiver LV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_LV.get(1), 400, 30); + + //Tesla Transceiver MV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_MV.get(1), 400, 120); + + //Tesla Transceiver HV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_HV.get(1), 400, 480); + + //Tesla Transceiver EV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 1A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_1by1_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_1by1_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_LV.get(1), 400, 30); + + //Tesla Transceiver MV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_MV.get(1), 400, 120); + + //Tesla Transceiver HV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_HV.get(1), 400, 480); + + //Tesla Transceiver EV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 4A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_2by2_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_2by2_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_LV.get(1), 400, 30); + + //Tesla Transceiver MV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_MV.get(1), 400, 120); + + //Tesla Transceiver HV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_HV.get(1), 400, 480); + + //Tesla Transceiver EV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 9A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_3by3_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_3by3_IV.get(1), 400, 7680); + + //Tesla Transceiver LV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_LV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_LV.get(1), 400, 30); + + //Tesla Transceiver MV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_MV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_MV.get(1), 400, 120); + + //Tesla Transceiver HV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_HV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_HV.get(1), 400, 480); + + //Tesla Transceiver EV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_EV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_EV.get(1), 400, 1920); + + //Tesla Transceiver IV 16A + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Lead.getMolten(576), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.Tin.getMolten(288), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + ItemList.Battery_Buffer_4by4_IV.get(1), + CustomItemList.teslaCoilCover.getWithDamage(1,0)}, + Materials.SolderingAlloy.getMolten(144), + CustomItemList.Machine_TeslaCoil_4by4_IV.get(1), 400, 7680); + + //endregion + + //region crafting components + + //Tesla Winding Components + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 32), + GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 8), + }, Materials.Epoxid.getMolten(288), CustomItemList.teslaComponent.getWithDamage(1,0), 320, 30); + + //endregion + //ha trafos //if(Loader.isModLoaded(Reference.GTPLUSPLUS)){ // GT_Values.RA.addAssemblerRecipe(CustomItemList.HA) diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 3fb8550c5b..00cad864bf 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -600,29 +600,29 @@ public class MachineLoader implements Runnable { // Tesla Transceiver // =================================================================================================== - Machine_TeslaCoil_LV_1A.set(new GT_MetaTileEntity_TeslaCoil(16000, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,1).getStackForm(1L)); - Machine_TeslaCoil_MV_1A.set(new GT_MetaTileEntity_TeslaCoil(16001, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 1).getStackForm(1L)); - Machine_TeslaCoil_HV_1A.set(new GT_MetaTileEntity_TeslaCoil(16002, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 1).getStackForm(1L)); - Machine_TeslaCoil_EV_1A.set(new GT_MetaTileEntity_TeslaCoil(16003, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 1).getStackForm(1L)); - Machine_TeslaCoil_IV_1A.set(new GT_MetaTileEntity_TeslaCoil(16004, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 1).getStackForm(1L)); - - Machine_TeslaCoil_LV_4A.set(new GT_MetaTileEntity_TeslaCoil(16005, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,4).getStackForm(1L)); - Machine_TeslaCoil_MV_4A.set(new GT_MetaTileEntity_TeslaCoil(16006, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 4).getStackForm(1L)); - Machine_TeslaCoil_HV_4A.set(new GT_MetaTileEntity_TeslaCoil(16007, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 4).getStackForm(1L)); - Machine_TeslaCoil_EV_4A.set(new GT_MetaTileEntity_TeslaCoil(16008, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 4).getStackForm(1L)); - Machine_TeslaCoil_IV_4A.set(new GT_MetaTileEntity_TeslaCoil(16009, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 4).getStackForm(1L)); - - Machine_TeslaCoil_LV_9A.set(new GT_MetaTileEntity_TeslaCoil(16010, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,9).getStackForm(1L)); - Machine_TeslaCoil_MV_9A.set(new GT_MetaTileEntity_TeslaCoil(16011, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 9).getStackForm(1L)); - Machine_TeslaCoil_HV_9A.set(new GT_MetaTileEntity_TeslaCoil(16012, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 9).getStackForm(1L)); - Machine_TeslaCoil_EV_9A.set(new GT_MetaTileEntity_TeslaCoil(16013, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 9).getStackForm(1L)); - Machine_TeslaCoil_IV_9A.set(new GT_MetaTileEntity_TeslaCoil(16014, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 9).getStackForm(1L)); - - Machine_TeslaCoil_LV_16A.set(new GT_MetaTileEntity_TeslaCoil(16015, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,16).getStackForm(1L)); - Machine_TeslaCoil_MV_16A.set(new GT_MetaTileEntity_TeslaCoil(16016, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 16).getStackForm(1L)); - Machine_TeslaCoil_HV_16A.set(new GT_MetaTileEntity_TeslaCoil(16017, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 16).getStackForm(1L)); - Machine_TeslaCoil_EV_16A.set(new GT_MetaTileEntity_TeslaCoil(16018, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 16).getStackForm(1L)); - Machine_TeslaCoil_IV_16A.set(new GT_MetaTileEntity_TeslaCoil(16019, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 16).getStackForm(1L)); + Machine_TeslaCoil_1by1_LV.set(new GT_MetaTileEntity_TeslaCoil(16000, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,1).getStackForm(1L)); + Machine_TeslaCoil_1by1_MV.set(new GT_MetaTileEntity_TeslaCoil(16001, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 1).getStackForm(1L)); + Machine_TeslaCoil_1by1_HV.set(new GT_MetaTileEntity_TeslaCoil(16002, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 1).getStackForm(1L)); + Machine_TeslaCoil_1by1_EV.set(new GT_MetaTileEntity_TeslaCoil(16003, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 1).getStackForm(1L)); + Machine_TeslaCoil_1by1_IV.set(new GT_MetaTileEntity_TeslaCoil(16004, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 1).getStackForm(1L)); + + Machine_TeslaCoil_2by2_LV.set(new GT_MetaTileEntity_TeslaCoil(16005, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,4).getStackForm(1L)); + Machine_TeslaCoil_2by2_MV.set(new GT_MetaTileEntity_TeslaCoil(16006, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 4).getStackForm(1L)); + Machine_TeslaCoil_2by2_HV.set(new GT_MetaTileEntity_TeslaCoil(16007, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 4).getStackForm(1L)); + Machine_TeslaCoil_2by2_EV.set(new GT_MetaTileEntity_TeslaCoil(16008, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 4).getStackForm(1L)); + Machine_TeslaCoil_2by2_IV.set(new GT_MetaTileEntity_TeslaCoil(16009, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 4).getStackForm(1L)); + + Machine_TeslaCoil_3by3_LV.set(new GT_MetaTileEntity_TeslaCoil(16010, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,9).getStackForm(1L)); + Machine_TeslaCoil_3by3_MV.set(new GT_MetaTileEntity_TeslaCoil(16011, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 9).getStackForm(1L)); + Machine_TeslaCoil_3by3_HV.set(new GT_MetaTileEntity_TeslaCoil(16012, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 9).getStackForm(1L)); + Machine_TeslaCoil_3by3_EV.set(new GT_MetaTileEntity_TeslaCoil(16013, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 9).getStackForm(1L)); + Machine_TeslaCoil_3by3_IV.set(new GT_MetaTileEntity_TeslaCoil(16014, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 9).getStackForm(1L)); + + Machine_TeslaCoil_4by4_LV.set(new GT_MetaTileEntity_TeslaCoil(16015, "machine.tt.tesla.01", "Basic Tesla Transceiver", 1,16).getStackForm(1L)); + Machine_TeslaCoil_4by4_MV.set(new GT_MetaTileEntity_TeslaCoil(16016, "machine.tt.tesla.02", "Advanced Tesla Transceiver", 2, 16).getStackForm(1L)); + Machine_TeslaCoil_4by4_HV.set(new GT_MetaTileEntity_TeslaCoil(16017, "machine.tt.tesla.03", "Epyc Tesla Transceiver", 3, 16).getStackForm(1L)); + Machine_TeslaCoil_4by4_EV.set(new GT_MetaTileEntity_TeslaCoil(16018, "machine.tt.tesla.04", "Ultimate Power Tesla Transceiver", 4, 16).getStackForm(1L)); + Machine_TeslaCoil_4by4_IV.set(new GT_MetaTileEntity_TeslaCoil(16019, "machine.tt.tesla.05", "Insane Tesla Transceiver", 5, 16).getStackForm(1L)); // =================================================================================================== // Debug Stuff diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index e763bd4179..766aca565f 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -94,10 +94,10 @@ public enum CustomItemList implements IItemContainer { scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover,teslaComponent, - Machine_TeslaCoil_LV_1A, Machine_TeslaCoil_MV_1A, Machine_TeslaCoil_HV_1A, Machine_TeslaCoil_EV_1A, Machine_TeslaCoil_IV_1A, - Machine_TeslaCoil_LV_4A, Machine_TeslaCoil_MV_4A, Machine_TeslaCoil_HV_4A, Machine_TeslaCoil_EV_4A, Machine_TeslaCoil_IV_4A, - Machine_TeslaCoil_LV_9A, Machine_TeslaCoil_MV_9A, Machine_TeslaCoil_HV_9A, Machine_TeslaCoil_EV_9A, Machine_TeslaCoil_IV_9A, - Machine_TeslaCoil_LV_16A, Machine_TeslaCoil_MV_16A, Machine_TeslaCoil_HV_16A, Machine_TeslaCoil_EV_16A, Machine_TeslaCoil_IV_16A; + Machine_TeslaCoil_1by1_LV, Machine_TeslaCoil_1by1_MV, Machine_TeslaCoil_1by1_HV, Machine_TeslaCoil_1by1_EV, Machine_TeslaCoil_1by1_IV, + Machine_TeslaCoil_2by2_LV, Machine_TeslaCoil_2by2_MV, Machine_TeslaCoil_2by2_HV, Machine_TeslaCoil_2by2_EV, Machine_TeslaCoil_2by2_IV, + Machine_TeslaCoil_3by3_LV, Machine_TeslaCoil_3by3_MV, Machine_TeslaCoil_3by3_HV, Machine_TeslaCoil_3by3_EV, Machine_TeslaCoil_3by3_IV, + Machine_TeslaCoil_4by4_LV, Machine_TeslaCoil_4by4_MV, Machine_TeslaCoil_4by4_HV, Machine_TeslaCoil_4by4_EV, Machine_TeslaCoil_4by4_IV; private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 74a1834818..b144902824 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single;
+import com.github.technus.tectech.CommonValues;
import com.github.technus.tectech.TecTech;
import com.github.technus.tectech.Util;
import com.github.technus.tectech.loader.NetworkDispatcher;
@@ -15,7 +16,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumChatFormatting;
+import org.apache.commons.lang3.ArrayUtils;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -71,6 +75,18 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB }
@Override
+ public String[] getDescription() {
+ String[] jargon = new String[3];
+ jargon[0] = CommonValues.BASS_MARK;
+ jargon[1] = "Your Tesla I/O machine of choice";
+ jargon[2] = EnumChatFormatting.AQUA + "Lightning stoves for the rich";
+ String[] sDesc = super.getDescription();
+ sDesc = Arrays.copyOfRange(sDesc, 1, sDesc.length);
+ String[] desc = ArrayUtils.addAll(jargon, sDesc);
+ return desc;
+ }
+
+ @Override
public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (overdriveToggle) {
overdriveToggle = false;
|