From 9724d519e8944b843696d6c803df2cf5cd03131d Mon Sep 17 00:00:00 2001 From: Runakai1 Date: Wed, 3 May 2023 14:54:32 +0200 Subject: [PATCH] Tcon Nugget Conversion --- dependencies.gradle | 1 + .../java/magicbees/bees/BeeGenomeManager.java | 9 --- src/main/java/magicbees/bees/BeeMutation.java | 9 --- .../java/magicbees/bees/BeeProductHelper.java | 70 ++++--------------- src/main/java/magicbees/bees/BeeSpecies.java | 4 -- .../assets/magicbees/lang/de_DE.lang | 2 - .../assets/magicbees/lang/en_US.lang | 2 - .../assets/magicbees/lang/zh_CN.lang | 8 +-- 8 files changed, 17 insertions(+), 88 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index da6e08b..e3d6c51 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,6 +7,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Botania:1.9.17-GTNH:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.88:dev') { transitive = false } } diff --git a/src/main/java/magicbees/bees/BeeGenomeManager.java b/src/main/java/magicbees/bees/BeeGenomeManager.java index 7ce2f7e..16f27a7 100644 --- a/src/main/java/magicbees/bees/BeeGenomeManager.java +++ b/src/main/java/magicbees/bees/BeeGenomeManager.java @@ -718,15 +718,6 @@ public class BeeGenomeManager { return genome; } - public static IAllele[] getTemplateOsmium() { - IAllele[] genome = getTemplateBaseMetallic(); - - genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.OSMIUM.getSpecies(); - genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger"); - - return genome; - } - public static IAllele[] getTemplateDiamond() { IAllele[] genome = getTemplateBaseMetallic(); diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index 57fc68a..8f11485 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -417,15 +417,6 @@ public class BeeMutation { 9).requireResource("blockManyullyn"); } - if (BeeSpecies.OSMIUM.isActive()) { - baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER.getSpecies() : Allele.getBaseSpecies("Imperial"); - baseB = (BeeSpecies.COBALT.isActive()) ? BeeSpecies.COBALT.getSpecies() : BeeSpecies.INFERNAL.getSpecies(); - mutation = beeMutationFactory.createMutation(baseA, baseB, BeeSpecies.OSMIUM.getGenome(), 11); - if (OreDictionary.getOres("blockOsmium").size() > 0) { - mutation.requireResource("blockOsmium"); - } - } - beeMutationFactory.createMutation( Allele.getBaseSpecies("Austere"), BeeSpecies.GOLD.getSpecies(), diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index a559a14..e44d319 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -2,6 +2,8 @@ package magicbees.bees; import static magicbees.bees.BeeSpecies.*; +import cpw.mods.fml.common.Loader; +import gregtech.api.enums.Materials; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -137,19 +139,12 @@ public class BeeProductHelper { public static void initOreDictSProducts() { SILVER.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("ingotSilver").size() > 0) { - SILVER.addSpecialty(Config.nuggets.getStackForType(NuggetType.SILVER), 0.16f); - } else { - SILVER.setInactive(); - } + SILVER.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Silver.getNuggets(1) : OreDictionary.getOres("nuggetSilver").get(0), 0.16f); LEAD.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("ingotLead").size() > 0) { - LEAD.addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 0.17f); - } else { - LEAD.setInactive(); - } + LEAD.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Lead.getNuggets(1) : OreDictionary.getOres("nuggetLead").get(0), 0.17f); + //Oil berry alu bee ALUMINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f); if (OreDictionary.getOres("nuggetAluminum").size() > 0) { ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetAluminum").get(0), 0.20f); @@ -158,71 +153,32 @@ public class BeeProductHelper { } TE_PLATINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetPlatinum").size() > 0 && OreDictionary.getOres("ingotPlatinum").size() > 0) { - TE_PLATINUM.addSpecialty(OreDictionary.getOres("nuggetPlatinum").get(0), 0.18f); - } else { - TE_PLATINUM.setInactive(); - } + TE_PLATINUM.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Platinum.getNuggets(1) : OreDictionary.getOres("nuggetPlatinum").get(0), 0.18f); TE_NICKEL.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetNickel").size() > 0 && OreDictionary.getOres("ingotNickel").size() > 0) { - TE_NICKEL.addSpecialty(OreDictionary.getOres("nuggetNickel").get(0), 0.18f); - } else { - TE_NICKEL.setInactive(); - } + TE_NICKEL.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Nickel.getNuggets(1) : OreDictionary.getOres("nuggetNickel").get(0), 0.18f); ARDITE.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetArdite").size() > 0) { - ARDITE.addSpecialty(OreDictionary.getOres("nuggetArdite").get(0), 0.18f); - } else { - ARDITE.setInactive(); - } + ARDITE.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Ardite.getNuggets(1) : OreDictionary.getOres("nuggetArdite").get(0), 0.18f); COBALT.addProduct(ForestryHelper.itemHoneycomb, 0.10f); if (OreDictionary.getOres("nuggetCobalt").size() > 0) { - COBALT.addSpecialty(OreDictionary.getOres("nuggetCobalt").get(0), 0.18f); - } - if (OreDictionary.getOres("nuggetNaturalCobalt").size() > 0) { - COBALT.addSpecialty(OreDictionary.getOres("nuggetNaturalCobalt").get(0), 0.24f); - } + COBALT.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Cobalt.getNuggets(1) : OreDictionary.getOres("nuggetCobalt").get(0), 0.18f); if (COBALT.getSpecies().getSpecialtyChances().size() <= 0) { COBALT.setInactive(); } TE_BRONZE.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetBronze").size() > 0 && OreDictionary.getOres("ingotBronze").size() > 0) { - TE_BRONZE.addSpecialty(OreDictionary.getOres("nuggetBronze").get(0), 0.18f); - } else { - TE_BRONZE.setInactive(); - } + TE_BRONZE.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Bronze.getNuggets(1) : OreDictionary.getOres("nuggetBronze").get(0), 0.18f); TE_INVAR.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetInvar").size() > 0 && OreDictionary.getOres("ingotInvar").size() > 0) { - TE_INVAR.addSpecialty(OreDictionary.getOres("nuggetInvar").get(0), 0.18f); - } else { - TE_INVAR.setInactive(); - } + TE_INVAR.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Invar.getNuggets(1) : OreDictionary.getOres("nuggetInvar").get(0), 0.18f); TE_ELECTRUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetElectrum").size() > 0 && OreDictionary.getOres("ingotElectrum").size() > 0) { - TE_ELECTRUM.addSpecialty(OreDictionary.getOres("nuggetElectrum").get(0), 0.18f); - } else { - TE_ELECTRUM.setInactive(); - } + TE_ELECTRUM.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Electrum.getNuggets(1) : OreDictionary.getOres("nuggetElectrum").get(0), 0.18f); MANYULLYN.addProduct(ForestryHelper.itemHoneycomb, 0.10f); - if (OreDictionary.getOres("nuggetManyullyn").size() > 0) { - MANYULLYN.addSpecialty(OreDictionary.getOres("nuggetManyullyn").get(0), 0.16f); - } else { - MANYULLYN.setInactive(); - } - - OSMIUM.addProduct(ForestryHelper.itemHoneycomb, 0.15f); - if (OreDictionary.getOres("nuggetOsmium").size() > 0) { - OSMIUM.addSpecialty(OreDictionary.getOres("nuggetOsmium").get(0), 0.16f); - } else { - OSMIUM.setInactive(); - } + MANYULLYN.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Manyullyn.getNuggets(1) : OreDictionary.getOres("nuggetManyullyn").get(0), 0.18f); CERTUS.addProduct(ForestryHelper.itemHoneycomb, 0.10f); if (OreDictionary.getOres("crystalCertusQuartz").size() > 0) { diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 1fa0be9..eb642a7 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -150,9 +150,6 @@ public enum BeeSpecies { false, false), MANYULLYN("Manyullyn", "manahmanah", BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT, EnumHumidity.ARID, true, false), - OSMIUM("Osmium", "hyacintho", BeeClassification.METALLIC, 0x374B5B, 0x6C7B89, EnumTemperature.NORMAL, - EnumHumidity.NORMAL, false, false), - DIAMOND("Diamond", "diamond", BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), EMERALD("Emerald", "prasinus", BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL, @@ -385,7 +382,6 @@ public enum BeeSpecies { ARDITE.registerGenomeTemplate(BeeGenomeManager.getTemplateArdite()); COBALT.registerGenomeTemplate(BeeGenomeManager.getTemplateCobalt()); MANYULLYN.registerGenomeTemplate(BeeGenomeManager.getTemplateManyullyn()); - OSMIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateOsmium()); DIAMOND.registerGenomeTemplate(BeeGenomeManager.getTemplateDiamond()); EMERALD.registerGenomeTemplate(BeeGenomeManager.getTemplateEmerald()); APATITE.registerGenomeTemplate(BeeGenomeManager.getTemplateApatite()); diff --git a/src/main/resources/assets/magicbees/lang/de_DE.lang b/src/main/resources/assets/magicbees/lang/de_DE.lang index 382e3ed..65abe86 100644 --- a/src/main/resources/assets/magicbees/lang/de_DE.lang +++ b/src/main/resources/assets/magicbees/lang/de_DE.lang @@ -333,8 +333,6 @@ magicbees.speciesCobalt=Cobalten magicbees.speciesCobalt.description=Die instabilen Eigenschaften dieses Materials scheinen die Bienen nicht im Geringsten zu beinflussen.|Apinomikon magicbees.speciesManyullyn=Manyullin magicbees.speciesManyullyn.description="Tie tie-pa-tie pie!" -magicbees.speciesOsmium=Osmiös -magicbees.speciesOsmium.description=Manche behaupten, der Name dieser Bienen wäre frei erfunden, trotz des offensichtlichen Zusammenhangs.|Apinomikon magicbees.speciesSilicon=Siliziös magicbees.speciesSilicon.description="Wieso schreibt man das überhaupt mit Z?"|Vexatos, Übersetzer magicbees.speciesCertus=Certos diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index bec079d..d11776f 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -367,8 +367,6 @@ magicbees.speciesCobalt=Cobalt magicbees.speciesCobalt.description=The unstable properties of this material seem to not affect the bees in the slightest.|Apinomicon magicbees.speciesManyullyn=Manyullyn magicbees.speciesManyullyn.description="Doot doo-dee-doot doot!" -magicbees.speciesOsmium=Osmium -magicbees.speciesOsmium.description=Occasionally confused for Iridium bees, despite their lack of goopy texture and pink colouration as described in older books.|Apinomicon magicbees.speciesSilicon=Silicon magicbees.speciesSilicon.description="Not to be confused with Silicone bees, AKA the Boo Bees!"|Myrathi, Wearer of Headpants magicbees.speciesCertus=Certus diff --git a/src/main/resources/assets/magicbees/lang/zh_CN.lang b/src/main/resources/assets/magicbees/lang/zh_CN.lang index aceb977..ca7ebe0 100644 --- a/src/main/resources/assets/magicbees/lang/zh_CN.lang +++ b/src/main/resources/assets/magicbees/lang/zh_CN.lang @@ -218,7 +218,7 @@ research.requiresPhaseSingle=月相为%s research.bonusPhase=在 %s 和 %s 之间更容易成功. research.bonusPhaseSingle=在 %s 时更容易成功. research.requiresNode=仅节点位于附近时才出现 -research.requiresNodeSpecific=当受到%s节点影响时才出现 +research.requiresNodeSpecific=当受到%s节点影响时才出现 research.requiresBiome=当处于%s这种生态群落才出现 research.requiresNight=仅在黄昏时分出现 research.node.pure=纯净 @@ -353,8 +353,6 @@ magicbees.speciesCobalt=辉钴 magicbees.speciesCobalt.description=这种金属不稳定的特性似乎丝毫没有影响这些蜜蜂.|Apinomicon magicbees.speciesManyullyn=玛玉灵 magicbees.speciesManyullyn.description="咚!嘟滴嘟~咚!" -magicbees.speciesOsmium=蓝锇 -magicbees.speciesOsmium.description=据古书记载有时会与传说中的铱金蜂混淆, 除了不那么粘稠的材质和粉红的色泽.|Apinomicon magicbees.speciesSilicon=硅晶 magicbees.speciesSilicon.description="不要和硅胶蜂弄混了,也就是著名的Boo Bees!"|Myrathi,穿短裤的人 magicbees.speciesCertus=定型 @@ -693,7 +691,7 @@ magicbees.botania.lexicon.beeAlfheim.title=艾尔芙海姆的魔法蜜蜂 magicbees.botania.lexicon.beeAlfheim.trade=换取&b精灵雄蜂&0 magicbees.botania.lexicon.beeAlfheim.0=&1精灵族养蜂员&0正急于探寻你 的蜜蜂的快乐，而且特别对你 可以提供的&1梦境雄蜂&0感兴趣。 作为回报,精灵们会以&b精灵雄 蜂&0为交换，这是艾尔芙海姆仅 有的一种蜜蜂。 -magicbees.botania.lexicon.beegonia.0=雄蜂是一个强健的聚居地的 未来的基石，但事实上，她们甚 至可以在一个你根本不知从 何下手的地方开始堆积起来。
现在隆重推出&1食蜂海棠&0，这是 一种解决蜜蜂过度拥挤的极 佳方案！只需把多余的雄蜂丢 给这朵花儿，她就会开始改 造蜜蜂的生命力并最终变为 魔力！ +magicbees.botania.lexicon.beegonia.0=雄蜂是一个强健的聚居地的 未来的基石，但事实上，她们甚 至可以在一个你根本不知从 何下手的地方开始堆积起来。
现在隆重推出&1食蜂海棠&0，这是 一种解决蜜蜂过度拥挤的极 佳方案！只需把多余的雄蜂丢 给这朵花儿，她就会开始改 造蜜蜂的生命力并最终变为 魔力！ magicbees.botania.lexicon.beegonia.1=她们并不是很挑剔，她们会在 工作时持续产出一定量的魔 力，虽然这看起来确实“复杂”： 蜜蜂提供了比普通蜜蜂更多 的魔力，管它什么意思。 magicbees.botania.lexicon.beegonia.crafting=Syncrostrike的完美解决方案 magicbees.botania.lexicon.beegonia.2=嗯.要么就是它,要么就是&2飞行 蜜蜂陷阱&0,但是那个也有它自 己的问题. @@ -708,4 +706,4 @@ magicbees.botania.lexicon.hibeescus.2=另外强烈建议节约魔力，因为 magicbees.botania.lexicon.hibeescus.crafting=仅为居心不良者使用。 magicbees.botania.lexicon.manaBooster.0=魔力蜂箱是一种非常自然的 让蜜蜂加快工作速度的方式， 但它也有一点...局限。
幸运的是，活石和花瓣的特性 使得它们可以偶尔为蜜蜂充 能，从而使蜜蜂们更高产。 只需向&1魔力蜂箱加速器&0持续 提供魔力，它们就可以一直让 蜜蜂们保持高产状态。 -magicbees.botania.lexicon.manaBooster.crafting=充满魔力的蜂群中! \ No newline at end of file +magicbees.botania.lexicon.manaBooster.crafting=充满魔力的蜂群中!