diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 16 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index f682fd72c6..50e3e853b2 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -196,7 +196,9 @@ public enum CombType { CAELESTISGREEN(155, "caelestisgreen", true, Materials._NULL, 100, 0x00FF00, 0xB233FF), CAELESTISBLUE(156, "caelestisblue", true, Materials._NULL, 100, 0x0000FF, 0xFF99A5), UNKNOWNWATER(157, "unknownwater", true, Materials._NULL, 100, 0x36ABFF, 0x4333A5), + //ESSENTIA gets a use soon. Dont remove. ESSENTIA(158, "essentia", true, Materials._NULL, 100, 0xED3601, 0xFF6D50), + INDIUM(159, "indium", true, Materials.Indium, 100, 0x8F5D99, 0xFFA9FF), //ALWAYS KEEP _NULL AT THE BOTTOM _NULL(-1, "INVALIDCOMB", false, Materials._NULL, 0, 0, 0); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 7957bdd33a..b6484d394f 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -232,6 +232,7 @@ public class ItemComb extends Item { addProcessGT(CombType.COPPER, new Materials[] {Materials.Copper}, Voltage.LV); addProcessGT(CombType.TIN, new Materials[] {Materials.Tin}, Voltage.LV); addProcessGT(CombType.LEAD, new Materials[] {Materials.Lead}, Voltage.LV); + addProcessGT(CombType.INDIUM, new Materials[] {Materials.Indium}, Voltage.ZPM); addProcessGT(CombType.NICKEL, new Materials[] {Materials.Nickel}, Voltage.LV); addProcessGT(CombType.ZINC, new Materials[] {Materials.Zinc}, Voltage.LV); addProcessGT(CombType.SILVER, new Materials[] {Materials.Silver}, Voltage.LV); diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 388ae1398a..7be5d054a1 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -824,6 +824,20 @@ public enum GT_BeeDefinition implements IBeeDefinition { dis -> dis.registerMutation(ASH, PEAT, 15) ), + INDIUM(GT_BranchDefinition.RAREMETAL, "Electrotine", false, new Color(0xFFA9FF), new Color(0x8F5D99), + beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.NORMAL); + beeSpecies.setTemperature(HOT); + }, + template -> AlleleHelper.instance.set(template, SPEED, Speed.FAST), + dis -> { + IBeeMutationCustom tMutation = dis.registerMutation(LEAD, OSMIUM, 3); + tMutation.requireResource("blockIndium"); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus"));//Venus Dim + } + ), + //IC2 COOLANT(GT_BranchDefinition.IC2, "Coolant", false, new Color(0x144F5A), new Color(0x2494A2), beeSpecies -> { @@ -2774,7 +2788,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), dis -> { - IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 100); + IBeeMutationCustom tMutation = dis.registerMutation(INFINITYCATALYST, COSMICNEUTRONIUM, 1, 10); if (Loader.isModLoaded("avaritiaddons")) tMutation.requireResource(GameRegistry.findBlock("avaritiaddons", "InfinityChest"), 0); } |