Add bee in courtesy to DaddyDiddy (#2507)

* [major] new effect, comb, flower, mutation condition

* [minor] imports

* Update GT_BeeDefinition.java

* [minor] fancier processing

* [patch] bs

* Update ItemComb.java

* Update SifterRecipes.java

* [minor] nuked machine booster effect

* Added back the effect but now with tick throttling. Right now it is set so the effect only gets triggered every 30 seconds.

* SA & BS

* [minor] add dynamic authority

* rename comb type and bee
reduce speed to super speed

* update bs + sa

* changed to fastest because super speed was 2x blinding (wired naming)

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

3 files changed, 64 insertions, 1 deletions

diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java
index d227c6c4ae..84ca2fa493 100644
--- a/src/main/java/gregtech/common/items/CombType.java
+++ b/src/main/java/gregtech/common/items/CombType.java
@@ -213,10 +213,10 @@ public enum CombType {
         ItemComb.Voltage.MV),
     PALLADIUM(164, "palladium", true, Materials.Palladium, 50, 0x8B8B8B, 0xF1D9D9, ItemComb.Voltage.MV),
     INFUSEDGOLD(165, "infused_gold", true, Materials.InfusedGold, 50, 0x80641E, 0xFFC83C, ItemComb.Voltage.IV),
-
     // Additions to rare metals, moved here so we don't shift all comb IDs
     NEODYMIUM(166, "neodymium", true, Materials.Neodymium, 50, 0x555555, 0x4F4F4F, ItemComb.Voltage.HV),
     EUROPIUM(167, "europium", true, Materials.Europium, 10, 0xDAA0E2, 0xAB7EB1, ItemComb.Voltage.LuV),
+    MACHINIST(168, "machinist", true, Materials._NULL, 100, 0x552582, 0xFDB927, ItemComb.Voltage.MV),
 
     // ALWAYS KEEP _NULL AT THE BOTTOM
     _NULL(-1, "INVALIDCOMB", false, Materials._NULL, 0, 0, 0);
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index f7463ae576..b7380d9eff 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -1676,6 +1676,58 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                 new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 512L),
                 new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 512L)));
 
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_LV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.IronMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.AnyIron), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
+                OrePrefixes.cableGt01.get(Materials.Tin) });
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_LV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.Steel), 'W', OrePrefixes.wireGt01.get(Materials.AnyCopper), 'C',
+                OrePrefixes.cableGt01.get(Materials.Tin) });
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_MV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.Aluminium), 'W', OrePrefixes.wireGt02.get(Materials.Cupronickel), 'C',
+                OrePrefixes.cableGt01.get(Materials.AnyCopper) });
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_HV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.SteelMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.StainlessSteel), 'W', OrePrefixes.wireGt04.get(Materials.Electrum), 'C',
+                OrePrefixes.cableGt02.get(Materials.Silver) });
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_EV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.Titanium), 'W', OrePrefixes.wireGt04.get(Materials.BlackSteel), 'C',
+                OrePrefixes.cableGt02.get(Materials.Aluminium) });
+        GT_ModHandler.addCraftingRecipe(
+            ItemList.Electric_Motor_IV.get(1L),
+            GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE
+                | GT_ModHandler.RecipeBits.REVERSIBLE,
+            new Object[] { "CWR", "WIW", "RWC", 'I', OrePrefixes.stick.get(Materials.NeodymiumMagnetic), 'R',
+                OrePrefixes.stick.get(Materials.TungstenSteel), 'W', OrePrefixes.wireGt04.get(Materials.Graphene), 'C',
+                OrePrefixes.cableGt02.get(Materials.Tungsten) });
+
+        ItemList.ElectronicsLump.set(
+            addItem(
+                414,
+                "Lump of Electronics",
+                "How did they even produce this?",
+                new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 1L),
+                new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1L),
+                new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 1L)));
+
         ItemList.Tesseract.set(
             addItem(
                 Tesseract.ID,
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 0d86237c2e..eaecd19f73 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -5,7 +5,9 @@ import static gregtech.api.enums.GT_Values.NF;
 import static gregtech.api.enums.GT_Values.NI;
 import static gregtech.api.enums.GT_Values.V;
 import static gregtech.api.enums.Mods.AE2FluidCraft;
+import static gregtech.api.enums.Mods.ExtraBees;
 import static gregtech.api.enums.Mods.ExtraUtilities;
+import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.MagicBees;
@@ -730,6 +732,15 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer {
                 new int[] { 100 * 100 },
                 Voltage.LV);
         }
+        addCentrifugeToItemStack(
+            CombType.MACHINIST,
+            new ItemStack[] { GT_ModHandler.getModItem(Forestry.ID, "royalJelly", 1L, 0),
+                GT_ModHandler.getModItem(Forestry.ID, "pollen", 1L, 0),
+                GT_ModHandler.getModItem(Forestry.ID, "honeyDrop", 1L, 0),
+                GT_ModHandler.getModItem(ExtraBees.ID, "honeyDrop", 1L, 6),
+                GT_ModHandler.getModItem(Forestry.ID, "beeswax", 1L, 0), ItemList.ElectronicsLump.get(1) },
+            new int[] { 10 * 100, 10 * 100, 20 * 100, 10 * 100, 20 * 100, 5 * 100 },
+            Voltage.ULV);
         // Space Line
         addCentrifugeToItemStack(
             CombType.SPACE,