diff options
| author | Runakai1 <48415331+Runakai1@users.noreply.github.com> | 2022-10-07 21:22:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 21:22:02 +0200 |
| commit | 85962632c23ee1c4418ddd8face2a1a1e4c3f1e8 (patch) | |
| tree | def910a0d79b525b24cde97a8922a728a64b12ee /src/main/java | |
| parent | 42d9582f4c3964cf8965460aa79d654bae3b5a9b (diff) | |
| download | GT5-Unofficial-85962632c23ee1c4418ddd8face2a1a1e4c3f1e8.tar.gz GT5-Unofficial-85962632c23ee1c4418ddd8face2a1a1e4c3f1e8.tar.bz2 GT5-Unofficial-85962632c23ee1c4418ddd8face2a1a1e4c3f1e8.zip | |
Cryotheum bee change (#1443)
* Add Blizz comb
* apply spotless
* Wrong way around
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/common/items/CombType.java | 3 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 5 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 49acf1be32..378ec4bdeb 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -18,7 +18,7 @@ public enum CombType { ENERGY(7, "energy", true, Materials._NULL, 80, 0xC11F1F, 0xEBB9B9), LAPOTRON(8, "lapotron", true, Materials._NULL, 60, 0x1414FF, 0x6478FF), PYROTHEUM(9, "pyrotheum", true, Materials.Pyrotheum, 50, 0xffebc4, 0xe36400), - CRYOTHEUM(10, "cryotheum", true, Materials.Pyrotheum, 50, 0x2660ff, 0x5af7ff), + CRYOTHEUM(10, "cryotheum", true, Materials.Cryotheum, 50, 0x2660ff, 0x5af7ff), // Alloy Line REDALLOY(11, "redalloy", true, Materials.RedAlloy, 100, 0xE60000, 0xB80000), @@ -198,6 +198,7 @@ public enum CombType { // 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), + BLIZZ(160, "cryotheum", true, Materials.Blizz, 50, 0xFF99A5, 0x5af7ff), // 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 88aeef76da..206882e159 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -227,6 +227,11 @@ public class ItemComb extends Item { 30 * 100); addCentrifugeToItemStack( CombType.CRYOTHEUM, + new ItemStack[] {ItemList.FR_RefractoryWax.get(1), Materials.Cryotheum.getDust(1)}, + new int[] {50 * 100, 100 * 100}, + Voltage.MV); + addCentrifugeToItemStack( + CombType.BLIZZ, new ItemStack[] {ItemList.FR_RefractoryWax.get(1), Materials.Blizz.getDust(1)}, new int[] {50 * 100, 100 * 100}, Voltage.MV); diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index acfdc0ba40..cdf3f14186 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1019,7 +1019,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { // Sulfur bee, Humidity: normal, Temperature: Hot, Parents: PEAT & Ash, Mutationrate: 15%, Combrate: 80% SULFUR( GT_BranchDefinition.RAREMETAL, - "Electrotine", + "Sulfur", false, new Color(0x1E90FF), new Color(0x3CB4C8), @@ -1175,8 +1175,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { new Color(0x2660ff), new Color(0x5af7ff), beeSpecies -> { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.COOLANT), 0.20f); - beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CRYOTHEUM), 0.15f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BLIZZ), 0.15f); + beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.CRYOTHEUM), 0.20f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); |