diff options
| author | DreamMasterXXL <dream-master@gmx.net> | 2020-05-12 23:17:34 +0200 |
|---|---|---|
| committer | DreamMasterXXL <dream-master@gmx.net> | 2020-05-12 23:17:34 +0200 |
| commit | 4d1a048f03e55505804bbd6906240c1044b821ae (patch) | |
| tree | 30a9e798dc56d4b25b9f79e0d9b9ea3f4985cedc /src/main/java/gregtech/common/items | |
| parent | a366a77a6bc785e51bf966826a3b9a7ff4a8e806 (diff) | |
| download | GT5-Unofficial-4d1a048f03e55505804bbd6906240c1044b821ae.tar.gz GT5-Unofficial-4d1a048f03e55505804bbd6906240c1044b821ae.tar.bz2 GT5-Unofficial-4d1a048f03e55505804bbd6906240c1044b821ae.zip | |
fix a few things
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index e9c7817d95..f114997c8b 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -157,7 +157,8 @@ public enum CombType { ENDERMAN("enderman", true, Materials._NULL, 25,0x6200e7, 0x161616), SILVERFISH("silverfish", true, Materials._NULL, 25,0x0000000, 0xEE053D), ENDIUM("endium", true, Materials.HeeEndium, 50,0x2F5A6C, 0xa0ffff), - RUNE("rune", true, Materials._NULL, 10,0x0104D9, 0xE31010); + RUNEI("rune1", true, Materials._NULL, 10,0x0104D9, 0xE31010), + RUNEII("rune2", true, Materials._NULL, 10,0xE31010, 0x0104D9); public boolean showInList; public Materials material; diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index c777174347..d5023d2266 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -18,7 +18,6 @@ import gregtech.loaders.materialprocessing.ProcessingModSupport; import gregtech.loaders.misc.GT_Bees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -476,8 +475,10 @@ public class ItemComb extends Item { GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish), GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Items.spawn_egg, 1,60), GT_Values.NI, GT_Values.NI, new int[]{2500, 1000, 2000, 1500}, 512, 1920); tComb = getStackForType(CombType.ENDIUM); addProcessHV(tComb,Materials.HeeEndium,50); - tComb = getStackForType(CombType.RUNE); - GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_Bees.propolis.getStackForType(PropolisType.Silverfish), GT_Bees.drop.getStackForType(DropType.ENDERGOO), new ItemStack(Blocks.monster_egg, 1,60), GT_Values.NI, GT_Values.NI, new int[]{2500, 1000, 2000, 1500}, 512, 1920); + tComb = getStackForType(CombType.RUNEI); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfPowerFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfAgilityFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfVigorFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfDefenseFragment", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfMagicFragment", 1L, 0), new int[]{2500, 500, 500, 500, 500, 500}, 640, 7680); + tComb = getStackForType(CombType.RUNEII); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_ModHandler.getModItem("MagicBees", "wax", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.RuneOfVoidFragment", 1L, 0), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[]{5000, 250}, 640, 7680); //Space Line tComb = getStackForType(CombType.SPACE); |