aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-08-22 20:02:13 +0100
committerBass <tudurap.com@gmail.com>2019-08-22 20:02:13 +0100
commit635e177d06c3b4d50e46978bc8ff30dcd8c3cd4f (patch)
tree2b6635bd9465d343efda182512cf12b292cbe867 /src/main/java/com
parent673427b3abde1821dbf476ee23f0e3622b5900ad (diff)
downloadGT5-Unofficial-635e177d06c3b4d50e46978bc8ff30dcd8c3cd4f.tar.gz
GT5-Unofficial-635e177d06c3b4d50e46978bc8ff30dcd8c3cd4f.tar.bz2
GT5-Unofficial-635e177d06c3b4d50e46978bc8ff30dcd8c3cd4f.zip
Ultra Uber Unlimited Unusable Recipe Commit
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java131
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java73
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java2
3 files changed, 142 insertions, 64 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 eae1121d80..d51f317975 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
@@ -168,8 +168,71 @@ public class DreamCraftRecipeLoader implements Runnable {
getOrDefault("Trinium",Materials.Osmium).getMolten(1296),
}, CustomItemList.eM_Coil.get(4), 800, 2000000);
- //endregion
+ //Tesla Base
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1)
+ }, null, CustomItemList.tM_TeslaBase.get(1), 50, 16);
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaBase.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"PhP","PFP","PwP",
+ 'P', OrePrefixes.plate.get(Materials.NickelZincFerrite),
+ 'F', OrePrefixes.frameGt.get(Materials.NickelZincFerrite)});
+
+ //Tesla Toroid
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1)
+ }, null, CustomItemList.tM_TeslaToroid.get(1), 50, 16);
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaToroid.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"PhP","PFP","PwP",
+ 'P', OrePrefixes.foil.get(Materials.Aluminium),
+ 'F', OrePrefixes.frameGt.get(Materials.Aluminium)});
+
+ //Tesla Secondary Windings
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ CustomItemList.teslaComponent.getWithDamage(8,0),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(12)
+ }, Materials.Silver.getMolten(144), CustomItemList.tM_TeslaSecondary.get(1), 200, 120);
+
+ //Tesla Primary Coils T0
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(8)
+ }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_0.get(1), 200, 30);
+
+ //Tesla Primary Coils T1
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(12)
+ }, Materials.Magnesium.getMolten(144), CustomItemList.tM_TeslaPrimary_1.get(1), 200, 120);
+
+ //Tesla Primary Coils T2
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(16)
+ }, Materials.Barium.getMolten(144), CustomItemList.tM_TeslaPrimary_2.get(1), 200, 480);
+
+ //Tesla Primary Coils T3
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(20)
+ }, Materials.Platinum.getMolten(144), CustomItemList.tM_TeslaPrimary_3.get(1), 200, 1920);
+ //Tesla Primary Coils T4
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(24)
+ }, Materials.Vanadium.getMolten(144), CustomItemList.tM_TeslaPrimary_4.get(1), 200, 7680);
+
+ //Tesla Primary Coils T5
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8),
+ com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(28)
+ }, Materials.Indium.getMolten(144), CustomItemList.tM_TeslaPrimary_5.get(1), 50, 30720);
+
+ //endregion
//region hatches
@@ -412,72 +475,28 @@ public class DreamCraftRecipeLoader implements Runnable {
//endregion
-
//region multi blocks
- //Tesla Coil
+ //Tesla Winding Components (ADD BLOOD VARIANT)
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- CustomItemList.tM_TeslaSecondary.get(6),
- GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 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);
-
- //Tesla Winding Components
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 4),
- GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 1),
+ 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);
- //Tesla Winding Components Ultimate
+ //Tesla Winding Components Ultimate (ADD BLOOD VARIANT)
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV,4),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NickelZincFerrite, 1),
}, Materials.Polytetrafluoroethylene.getMolten(18), CustomItemList.teslaComponent.getWithDamage(1,1), 320, 7680);
- //Tesla Secondary Windings
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- CustomItemList.teslaComponent.getWithDamage(64,0),
- GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(12)
- }, Materials.Silver.getMolten(144), CustomItemList.tM_TeslaSecondary.get(1), 200, 120);
-
- //Tesla Primary Coils T0
+ //Tesla Coil (ADD BLOOD VARIANT)
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.RedstoneAlloy, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(8)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_0.get(1), 200, 30);
-
- //Tesla Primary Coils T1
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorMV, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(12)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_1.get(1), 200, 120);
-
- //Tesla Primary Coils T2
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorHV, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(16)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_2.get(1), 200, 480);
-
- //Tesla Primary Coils T3
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorEV, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(20)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_3.get(1), 200, 1920);
-
- //Tesla Primary Coils T4
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorIV, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(24)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_4.get(1), 200, 7680);
-
- //Tesla Primary Coils T5
- GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
- GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorLuV, 8),
- com.dreammaster.item.ItemList.MicaInsulatorFoil.getIS(28)
- }, Materials.RedAlloy.getMolten(144), CustomItemList.tM_TeslaPrimary_5.get(1), 200, 30720);
+ CustomItemList.tM_TeslaSecondary.get(6),
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 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);
//Microwave Grinder
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
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 89b6eb1a56..02dc1a794e 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
@@ -39,8 +39,6 @@ public class BloodyRecipeLoader implements Runnable {
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Silver, 6)
}, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1), 200, 30720);
- //endregion
-
//Tunnel
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
CustomItemList.DATApipe.get(1),
@@ -57,9 +55,8 @@ public class BloodyRecipeLoader implements Runnable {
GT_ModHandler.getIC2Item("reinforcedGlass", 1L),
GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2)
}, null, CustomItemList.LASERpipe.get(1), 100, 500000);
-
- //endregoin
+ //endregion
//region casing
@@ -139,8 +136,71 @@ public class BloodyRecipeLoader implements Runnable {
Materials.Americium.getMolten(1296),
}, CustomItemList.eM_Coil.get(4), 800, 2000000);
- //endregion
+ //Tesla Base
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NickelZincFerrite, 1)
+ }, null, CustomItemList.tM_TeslaBase.get(1), 50, 16);
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaBase.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"PhP","PFP","PwP",
+ 'P', OrePrefixes.plate.get(Materials.NickelZincFerrite),
+ 'F', OrePrefixes.frameGt.get(Materials.NickelZincFerrite)});
+
+ //Tesla Toroid
+ GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+ GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 6),
+ GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1)
+ }, null, CustomItemList.tM_TeslaToroid.get(1), 50, 16);
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaToroid.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"PhP","PFP","PwP",
+ 'P', OrePrefixes.foil.get(Materials.Aluminium),
+ 'F', OrePrefixes.frameGt.get(Materials.Aluminium)});
+
+ //Tesla Secondary Windings
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaSecondary.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', CustomItemList.teslaComponent.getWithDamage(1,0)});
+
+ //Tesla Primary Coils T0
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_0.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.RedstoneAlloy)});
+
+ //Tesla Primary Coils T1
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_1.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.SuperconductorMV)});
+
+ //Tesla Primary Coils T2
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_2.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.SuperconductorHV)});
+
+ //Tesla Primary Coils T3
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_3.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.SuperconductorEV)});
+
+ //Tesla Primary Coils T4
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_4.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.SuperconductorIV)});
+
+ //Tesla Primary Coils T5
+ GT_ModHandler.addCraftingRecipe(CustomItemList.tM_TeslaPrimary_5.get(1),
+ GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+ new Object[]{"WWW","WwW","WWW",
+ 'W', OrePrefixes.wireGt02.get(Materials.SuperconductorLuV)});
+ //endregion
//region hatches
@@ -538,8 +598,7 @@ public class BloodyRecipeLoader implements Runnable {
}, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1), 800, 500000);
//endregion
-
-
+
//region multiblocks
//Microwave Grinder
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
index bb3a68a960..7decce34ae 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java
@@ -52,7 +52,7 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract {
aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "it's alive, IT'S ALIVE!");
break;
case 7://"Tesla Toroid Casing"
- aList.add("A shell for your coils");
+ aList.add("Made out of the finest tin foil!");
aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Faraday suits might come later");
break;
case 8://"Tesla Secondary Windings"