aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorAlex Bee <a.bramley@gmail.com>2023-07-06 10:09:32 +0100
committerGitHub <noreply@github.com>2023-07-06 11:09:32 +0200
commitaf72edf7300bc22d10c1861106ad475b43f012e3 (patch)
tree4b5b7a166bd4583a339dc4e7adacb869aeaffb09 /src/main/java
parent8115282baedea5d663ef2a8fb40091804de32e86 (diff)
downloadGT5-Unofficial-af72edf7300bc22d10c1861106ad475b43f012e3.tar.gz
GT5-Unofficial-af72edf7300bc22d10c1861106ad475b43f012e3.tar.bz2
GT5-Unofficial-af72edf7300bc22d10c1861106ad475b43f012e3.zip
Add infused gold bee. (#2119)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/common/items/CombType.java1
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java11
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java17
3 files changed, 29 insertions, 0 deletions
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);