aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBass <tudurap.com@gmail.com>2019-08-23 13:50:41 +0100
committerBass <tudurap.com@gmail.com>2019-08-23 13:50:41 +0100
commit2a4d5bd1f0e168e5ff237f386f8c3802e0057c5a (patch)
tree23beb52c2f8d5079316ca6b1b1c2e349325d9850 /src/main
parent2404af586550067c853c69338e87adb2ab3dcafb (diff)
downloadGT5-Unofficial-2a4d5bd1f0e168e5ff237f386f8c3802e0057c5a.tar.gz
GT5-Unofficial-2a4d5bd1f0e168e5ff237f386f8c3802e0057c5a.tar.bz2
GT5-Unofficial-2a4d5bd1f0e168e5ff237f386f8c3802e0057c5a.zip
Zeta Ready
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java22
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java8
2 files changed, 7 insertions, 23 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 67bbbb9635..027ef5542d 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
@@ -178,7 +178,6 @@ public class DreamCraftRecipeLoader implements Runnable {
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),
@@ -189,47 +188,40 @@ public class DreamCraftRecipeLoader implements Runnable {
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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(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)
+ getItemContainer("MicaInsulatorFoil").get(28)
}, Materials.Indium.getMolten(144), CustomItemList.tM_TeslaPrimary_5.get(1), 50, 30720);
//endregion
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 0521fdb13a..a1d400ed54 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
@@ -146,7 +146,6 @@ public class BloodyRecipeLoader implements Runnable {
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),
@@ -157,43 +156,36 @@ public class BloodyRecipeLoader implements Runnable {
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,