From af72edf7300bc22d10c1861106ad475b43f012e3 Mon Sep 17 00:00:00 2001 From: Alex Bee Date: Thu, 6 Jul 2023 10:09:32 +0100 Subject: Add infused gold bee. (#2119) --- src/main/java/gregtech/common/items/CombType.java | 1 + src/main/java/gregtech/common/items/ItemComb.java | 11 +++++++++++ .../java/gregtech/loaders/misc/GT_BeeDefinition.java | 17 +++++++++++++++++ src/main/resources/assets/gregtech/lang/en_US.lang | 1 + 4 files changed, 30 insertions(+) (limited to 'src/main') diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 38592d229c..96850727fd 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -210,6 +210,7 @@ public enum CombType { AWAKENEDDRACONIUM(163, "awakeneddraconium", true, Materials.DraconiumAwakened, 50, 0xD41238, 0xFFA157, ItemComb.Voltage.MV), PALLADIUM(164, "palladium", true, Materials.Palladium, 50, 0x8B8B8B, 0xF1D9D9, ItemComb.Voltage.MV), + INFUSEDGOLD(165, "infusedgold", true, Materials.InfusedGold, 50, 0x80641E, 0xFFC83C, ItemComb.Voltage.IV), // 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 f0c01424f5..a44f720f14 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -1326,6 +1326,17 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.MYTRYL, new Materials[] { Materials.Mytryl }, Voltage.IV); addProcessGT(CombType.QUANTIUM, new Materials[] { Materials.Quantium }, Voltage.IV); addProcessGT(CombType.ORIHARUKON, new Materials[] { Materials.Oriharukon }, Voltage.IV); + addProcessGT(CombType.INFUSEDGOLD, new Materials[] { Materials.InfusedGold }, Voltage.IV); + addCentrifugeToMaterial( + CombType.INFUSEDGOLD, + new Materials[] { Materials.InfusedGold, Materials.Gold }, + new int[] { (GT_Mod.gregtechproxy.mNerfedCombs ? 20 : 50) * 100, + (GT_Mod.gregtechproxy.mNerfedCombs ? 10 : 30) * 100 }, + new int[] {}, + Voltage.IV, + 200, + NI, + 10 * 100); addProcessGT(CombType.MYSTERIOUSCRYSTAL, new Materials[] { Materials.MysteriousCrystal }, Voltage.LuV); addCentrifugeToMaterial( CombType.MYSTERIOUSCRYSTAL, diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index a25f990b29..197c012825 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1776,6 +1776,23 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(46, "Oberon")); // Oberon Dim } }), + INFUSEDGOLD(GT_BranchDefinition.SPACE, "Infused Gold", false, new Color(0x80641E), new Color(0xFFC83C), + beeSpecies -> { + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.GOLD), 0.20f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFUSEDGOLD), 0.30f); + beeSpecies.setHumidity(DAMP); + beeSpecies.setTemperature(ICY); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); + }, template -> {}, new Consumer<>() { + + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(GOLD, HAUMEA, 5); + tMutation.requireResource(GregTech_API.sBlockMetal3, 10); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(83, "Haumea")); // Haumea Dim + } + }), MYSTERIOUSCRYSTAL(GT_BranchDefinition.SPACE, "MysteriousCrystal", false, new Color(0x3CB371), new Color(0x16856C), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.42f); diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 0a80c836bc..a4daa974f2 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -977,6 +977,7 @@ for.bees.species.callistoice=Callisto Ice for.bees.species.mytryl=Mytryl for.bees.species.quantium=Quantium for.bees.species.oriharukon=Oriharukon +for.bees.species.infusedgold=Infused Gold for.bees.species.mysteriouscrystal=Mysterious Crystal for.bees.species.blackplutonium=Black Plutonium for.bees.species.trinium=Trinium -- cgit