From 48ceef8b1afe2542bf39dc46831c8828d5aa7c26 Mon Sep 17 00:00:00 2001 From: Florian Kostenzer Date: Fri, 14 Apr 2023 15:45:55 +0200 Subject: [PATCH] feat: add alternative nether star bee --- .../modules/forestry/bees/GTBeeDefinition.java | 17 +++++++++++++++++ .../modules/forestry/bees/GTCombType.java | 3 +++ .../modules/forestry/recipes/CombRecipes.java | 2 ++ .../assets/gregification/lang/en_us.lang | 3 +++ 4 files changed, 25 insertions(+) diff --git a/src/main/java/gregification/modules/forestry/bees/GTBeeDefinition.java b/src/main/java/gregification/modules/forestry/bees/GTBeeDefinition.java index 33f64fc..ebb2f62 100644 --- a/src/main/java/gregification/modules/forestry/bees/GTBeeDefinition.java +++ b/src/main/java/gregification/modules/forestry/bees/GTBeeDefinition.java @@ -683,6 +683,23 @@ public enum GTBeeDefinition implements IBeeDefinition { mutation.requireResource("blockIridium"); } ), + NETHERSTAR(GTBranchDefinition.GT_RAREMETAL, "Infstella", false, 0x7A007A, 0xFFFFFF, + beeSpecies -> { + beeSpecies.addProduct(getGTComb(GTCombType.SLAG), 0.30f); + beeSpecies.addSpecialty(getGTComb(GTCombType.NETHERSTAR), 0.15f); + beeSpecies.addSpecialty(getGTComb(GTCombType.IRIDIUM), 0.05f); + beeSpecies.setHumidity(EnumHumidity.ARID); + beeSpecies.setTemperature(EnumTemperature.HELLISH); + beeSpecies.setHasEffect(); + }, + template -> AlleleHelper.getInstance().set(template, SPEED, Speed.SLOWER), + dis -> { + IBeeMutationBuilder mutation = dis.registerMutation(IRIDIUM, BeeDefinition.DEMONIC, 5); + mutation.requireResource("blockNetherStar"); + mutation.restrictBiomeType(BiomeDictionary.Type.NETHER); + }, + () -> !Loader.isModLoaded(ModIDs.MODID_MB) + ), OSMIUM(GTBranchDefinition.GT_RAREMETAL, "Osmia", false, 0x2B2BDA, 0x8B8B8B, beeSpecies -> { beeSpecies.addProduct(getGTComb(GTCombType.SLAG), 0.30f); diff --git a/src/main/java/gregification/modules/forestry/bees/GTCombType.java b/src/main/java/gregification/modules/forestry/bees/GTCombType.java index a233581..955afe9 100644 --- a/src/main/java/gregification/modules/forestry/bees/GTCombType.java +++ b/src/main/java/gregification/modules/forestry/bees/GTCombType.java @@ -122,6 +122,9 @@ public enum GTCombType { // Nether Star SPARKLING("sparkling", Loader.isModLoaded(ModIDs.MODID_MB), 0x7A007A, 0xFFFFFF), + // Nether Star without magic bees + NETHERSTAR("netherstar", !Loader.isModLoaded(ModIDs.MODID_MB), 0x7A007A, 0xFFFFFF), + //THAUMIUMSHARD("thaumiumshard", GTBees.THAUMIC_BEES, null, 85,0x9966FF, 0xAD85FF), //MITHRIL("mithril", GTBees.THAUMIC_BEES, null, 70,0xF0E68C, 0xFFFFD2), //ASTRALSILVER("astralsilver", GTBees.THAUMIC_BEES, null, 70,0xAFEEEE, 0xE6E6FF), diff --git a/src/main/java/gregification/modules/forestry/recipes/CombRecipes.java b/src/main/java/gregification/modules/forestry/recipes/CombRecipes.java index 903c2bb..1274398 100644 --- a/src/main/java/gregification/modules/forestry/recipes/CombRecipes.java +++ b/src/main/java/gregification/modules/forestry/recipes/CombRecipes.java @@ -222,6 +222,7 @@ public static void initGTCombs() { addChemicalProcess(GTCombType.MOLYBDENUM, Materials.Osmium, Materials.Osmium, Voltage.IV); addAutoclaveProcess(GTCombType.MOLYBDENUM, Materials.Osmium, Voltage.IV, 5); addProcessGT(GTCombType.IRIDIUM, new Material[]{Materials.Iridium, Materials.Osmium}, Voltage.IV); + addProcessGT(GTCombType.NETHERSTAR, new Material[]{Materials.NetherStar, Materials.Iridium}, Voltage.IV); addProcessGT(GTCombType.OSMIUM, new Material[]{Materials.Osmium, Materials.Iridium}, Voltage.IV); addProcessGT(GTCombType.LITHIUM, new Material[]{Materials.Lithium, Materials.Aluminium}, Voltage.MV); addProcessGT(GTCombType.SALT, new Material[]{Materials.Salt, Materials.RockSalt, Materials.Saltpeter}, Voltage.MV); @@ -240,6 +241,7 @@ public static void initGTCombs() { addCentrifugeToMaterial(GTCombType.PLATINUM, new Material[]{Materials.Platinum, Materials.Cooperite, Materials.Palladium}, new int[]{40 * 100, 40 * 100, 40 * 100}, new int[]{}, Voltage.HV, ItemStack.EMPTY, 30 * 100); addCentrifugeToMaterial(GTCombType.MOLYBDENUM, new Material[]{Materials.Molybdenum, Materials.Molybdenite, Materials.Powellite, Materials.Wulfenite}, new int[]{100 * 100, 80 * 100, 75 * 100}, new int[]{}, Voltage.ULV, ItemStack.EMPTY, 30 * 100); addCentrifugeToMaterial(GTCombType.IRIDIUM, new Material[]{Materials.Iridium, Materials.Osmium}, new int[]{20 * 100, 15 * 100}, new int[]{}, Voltage.IV, ItemStack.EMPTY, 30 * 100); + addCentrifugeToMaterial(GTCombType.NETHERSTAR, new Material[]{Materials.NetherStar, Materials.Iridium}, new int[]{20 * 100, 15 * 100}, new int[]{}, Voltage.IV, ItemStack.EMPTY, 30 * 100); addCentrifugeToMaterial(GTCombType.OSMIUM, new Material[]{Materials.Osmium, Materials.Iridium}, new int[]{25 * 100, 15 * 100}, new int[]{}, Voltage.IV, ItemStack.EMPTY, 30 * 100); addCentrifugeToMaterial(GTCombType.LITHIUM, new Material[]{Materials.Lithium, Materials.Aluminium}, new int[]{85 * 100, 75 * 100}, new int[]{}, Voltage.MV, ItemStack.EMPTY, 30 * 100); addCentrifugeToMaterial(GTCombType.SALT, new Material[]{Materials.Salt, Materials.RockSalt, Materials.Saltpeter}, new int[]{100 * 100, 75 * 100, 65 * 100}, new int[]{9, 4, 4}, Voltage.MV, 160, ItemStack.EMPTY, 50 * 100); diff --git a/src/main/resources/assets/gregification/lang/en_us.lang b/src/main/resources/assets/gregification/lang/en_us.lang index c14930e..75d9c6a 100644 --- a/src/main/resources/assets/gregification/lang/en_us.lang +++ b/src/main/resources/assets/gregification/lang/en_us.lang @@ -118,6 +118,7 @@ for.bees.species.manganese=Manganese for.bees.species.tungsten=Tungsten for.bees.species.platinum=Platinum for.bees.species.iridium=Iridium +for.bees.species.netherstar=Nether Star for.bees.species.osmium=Osmium for.bees.species.salty=Salt for.bees.species.lithium=Lithium @@ -180,6 +181,7 @@ for.bees.description.manganese= for.bees.description.tungsten= for.bees.description.platinum= for.bees.description.iridium= +for.bees.description.netherstar= for.bees.description.osmium= for.bees.description.salty= for.bees.description.lithium= @@ -256,6 +258,7 @@ item.gt.comb.chrome.name=Chrome Comb item.gt.comb.tungsten.name=Tungsten Comb item.gt.comb.platinum.name=Platinum Comb item.gt.comb.iridium.name=Iridium Comb +item.gt.comb.netherstar.name=Nether Star Comb item.gt.comb.molybdenum.name=Molybdenum Comb item.gt.comb.osmium.name=Osmium Comb item.gt.comb.lithium.name=Lithium Comb