Restricting Bees to MApiary + create class (#1470)

* Restricting Bees to MApiary + create class

* Revert Indium (wrong bee)

* SPOTLESS + new description

* Adjust chances to specialty comb

2 files changed, 41 insertions, 7 deletions

diff --git a/src/main/java/gregtech/api/util/GT_JubilanceMegaApiary.java b/src/main/java/gregtech/api/util/GT_JubilanceMegaApiary.java
new file mode 100644
index 0000000000..f20a58c34a
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_JubilanceMegaApiary.java
@@ -0,0 +1,23 @@
+package gregtech.api.util;
+
+import forestry.api.apiculture.IAlleleBeeSpecies;
+import forestry.api.apiculture.IBeeGenome;
+import forestry.api.apiculture.IBeeHousing;
+import forestry.api.apiculture.IJubilanceProvider;
+
+public class GT_JubilanceMegaApiary implements IJubilanceProvider {
+
+    public static final GT_JubilanceMegaApiary instance = new GT_JubilanceMegaApiary();
+
+    protected GT_JubilanceMegaApiary() {}
+
+    @Override
+    public boolean isJubilant(IAlleleBeeSpecies species, IBeeGenome genome, IBeeHousing housing) {
+        return false;
+    }
+
+    @Override
+    public String getDescription() {
+        return "Will only be produced in mega Apiary";
+    }
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index cdf3f14186..ddbff542fb 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -26,6 +26,7 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_JubilanceMegaApiary;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -1039,7 +1040,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0xFFA9FF),
             new Color(0x8F5D99),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.05f);
+                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INDIUM), 0.075f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(HOT);
             },
@@ -1968,11 +1969,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0xE6E6FF),
             new Color(0xC8C8C8),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.05f);
+                beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.075f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(EnumTemperature.NORMAL);
                 beeSpecies.setNocturnal();
                 beeSpecies.setHasEffect();
+                // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
+                beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
             },
             template -> {
                 AlleleHelper.instance.set(template, SPEED, Speed.SLOWEST);
@@ -3396,11 +3399,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0x484848),
             new Color(0x323232),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.COSMICNEUTRONIUM), 0.25f);
+                beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.COSMICNEUTRONIUM), 0.375f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
                 beeSpecies.setHasEffect();
+                // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
+                beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
             },
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {
@@ -3415,11 +3420,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0xFFFFFF),
             new Color(0xFFFFFF),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFINITYCATALYST), 0.02f);
+                beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITYCATALYST), 0.03f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(HELLISH);
                 beeSpecies.setNocturnal();
                 beeSpecies.setHasEffect();
+                // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
+                beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
             },
             template -> {
                 AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST);
@@ -3438,11 +3445,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0xFFFFFF),
             new Color(0xFFFFFF),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.INFINITY), 0.02f);
+                beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.INFINITY), 0.03f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
                 beeSpecies.setHasEffect();
+                // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
+                beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
             },
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {
@@ -3519,7 +3528,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0x8A97B0),
             new Color(0x160822),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.KRYPTON), 0.35f);
+                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.KRYPTON), 0.525f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -3538,11 +3547,13 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             new Color(0x8A97B0),
             new Color(0x160822),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.XENON), 0.35f);
+                beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.XENON), 0.35f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
                 beeSpecies.setHasEffect();
+                // Makes it only work in the Mega Apiary NOTE: COMB MUST BE SPECIALITY COMB
+                beeSpecies.setJubilanceProvider(GT_JubilanceMegaApiary.instance);
             },
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {