diff options
Diffstat (limited to 'src')
4 files changed, 71 insertions, 38 deletions
diff --git a/src/main/java/gregtech/common/items/CombType.java b/src/main/java/gregtech/common/items/CombType.java index 9db585a396..0588555179 100644 --- a/src/main/java/gregtech/common/items/CombType.java +++ b/src/main/java/gregtech/common/items/CombType.java @@ -192,18 +192,20 @@ public enum CombType { {0xC60000, 0x8B8B8B}, //Radioactive Line {0x19AF19, 0x169E16}, - {0x335C33, 0x6B8F00}, + {0x570000, 0x240000}, {0x003300, 0x002400}, {0x000000, 0x002400}, {0x003300, 0x002400}, - {0x005000, 0x001E00}, + {0x001E00, 0x005000}, {0xE6FFE6, 0xFFFFFF}, {0xE6E6FF, 0xC8C8C8}, {0xFFF0F0, 0xFAFAFA}, //Twilight {0x0D5A0D, 0x28874B}, - {0xC5C5C5, 0x5C605E}, + {0x5C605E, 0xC5C5C5}, {0x872836, 0xB8132C}, + {0xA7041C, 0x7C0618}, + {0xD02001, 0x9C0018}, }; public boolean showInList; public Materials material; diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 63600fc70d..00974a4904 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -26,6 +26,7 @@ import java.util.List; import static gregtech.api.enums.GT_Values.GT; import static gregtech.api.enums.GT_Values.MOD_ID; +import static gregtech.api.enums.GT_Values.MOD_ID_FR; public class ItemComb extends Item { @SideOnly(Side.CLIENT) @@ -368,16 +369,31 @@ public class ItemComb extends Item { // Radioactive Line tComb = getStackForType(CombType.URANIUM); addProcessLV(tComb,Materials.Uranium,50); - addProcessLV(tComb,Materials.Pitchblende,50); - addProcessLV(tComb,Materials.Uraninite,50); + addProcessLV(tComb,Materials.Pitchblende,65); + addProcessLV(tComb,Materials.Uraninite,75); addProcessLV(tComb,Materials.Uranium235,50); tComb = getStackForType(CombType.PLUTONIUM); addProcessLV(tComb,Materials.Plutonium,10); addProcessLV(tComb,Materials.Uranium235, Materials.Plutonium,5); tComb = getStackForType(CombType.NAQUADAH); addProcessLV(tComb,Materials.Naquadah,10); + addProcessLV(tComb,Materials.NaquadahEnriched,5); + addProcessLV(tComb,Materials.Naquadria,5); + tComb = getStackForType(CombType.NAQUADRIA); + addProcessLV(tComb,Materials.Naquadah,15); addProcessLV(tComb,Materials.NaquadahEnriched,10); addProcessLV(tComb,Materials.Naquadria,10); + // Twilight + tComb = getStackForType(CombType.NAGA); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 4), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.NagaScaleFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 256, 120); + tComb = getStackForType(CombType.LICH); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 5), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.LichBoneFragment", 1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 384, 480); + tComb = getStackForType(CombType.HYDRA); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 1), GT_ModHandler.getModItem("dreamcraft", "item.FieryBloodDrop", 1L, 0), GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1L, 2004), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 384, 480); + tComb = getStackForType(CombType.URGHAST); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 2), GT_ModHandler.getModItem("dreamcraft", "item..CarminiteChip", 1L, 0), GT_ModHandler.getModItem("dreamcraft", "item.CarminiteFragment",1L, 0), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 800, 0, 0}, 512, 1920); + tComb = getStackForType(CombType.SNOWQUEEN); + GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, ItemList.FR_Wax.get(1, new Object[0]), GT_ModHandler.getModItem("MagicBees", "propolis", 1L, 3), GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBloodDrop", 1L, 0), GT_ModHandler.getModItem("gendustry", "HoneyDrop", 1L, 2005), GT_Values.NI, GT_Values.NI, new int[]{3000, 500, 3300, 1000, 0, 0}, 512, 1920); } public void addSpecialCentLV(ItemStack tComb, ItemStack aOutput, int chance){ GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, aOutput, ItemList.FR_Wax.get(1, new Object[0]), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] { chance * 100, 5000 }, 128, 5); diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 93ea0e896f..410efa9ee0 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -973,7 +973,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.DIAMOND), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.HOT); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1015,7 +1015,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.ALUMINIUM), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1037,7 +1037,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PYROPE), 0.05f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1060,7 +1060,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.GROSSULAR), 0.05f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1082,7 +1082,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.FIRESTONE), 0.15f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1201,8 +1201,9 @@ public enum GT_BeeDefinition implements IBeeDefinition { @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(IRON.species, COAL.species, 10); - tMutation.restrictTemperature(EnumTemperature.HOT); tMutation.requireResource("blockSteel"); + tMutation.restrictTemperature(EnumTemperature.HOT); + } }, NICKEL(GT_BranchDefinition.METAL, "Nickel", true, 0x8585AD, 0x8585AD) { @@ -1444,7 +1445,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.OSMIUM), 0.05f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.HELLISH); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1466,7 +1467,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.IRIDIUM), 0.05f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.COLD); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1551,6 +1552,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URANIUM), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); + beeSpecies.setNocturnal(); } @Override @@ -1565,7 +1567,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource(GregTech_API.sBlockMetal7, 14); } }, - PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, 0x335C33, 0x6B8F00) { + PLUTONIUM(GT_BranchDefinition.RADIOACTIVE, "Plutonium", true, 0x570000, 0x240000) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SLAG), 0.30f); @@ -1573,13 +1575,13 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.PLUTONIUM), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.ICY); + beeSpecies.setNocturnal(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1595,14 +1597,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADAH), 0.15f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.ICY); - beeSpecies.hasEffect(); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1620,14 +1622,14 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAQUADRIA), 0.15f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.ICY); - beeSpecies.hasEffect(); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1642,7 +1644,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.DOB), 0.75f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.hasEffect(); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); beeSpecies.setIsSecret(); } @@ -1651,7 +1654,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1667,6 +1669,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.THORIUM), 0.75f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.COLD); + beeSpecies.setNocturnal(); beeSpecies.setIsSecret(); } @@ -1674,7 +1677,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1689,7 +1691,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.LUTETIUM), 0.15f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.hasEffect(); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); beeSpecies.setIsSecret(); } @@ -1697,7 +1700,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1712,7 +1714,8 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICUM), 0.05f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.hasEffect(); + beeSpecies.setNocturnal(); + beeSpecies.setHasEffect(); beeSpecies.setIsSecret(); } @@ -1720,7 +1723,6 @@ public enum GT_BeeDefinition implements IBeeDefinition { protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override @@ -1732,10 +1734,10 @@ public enum GT_BeeDefinition implements IBeeDefinition { NEUTRONIUM(GT_BranchDefinition.RADIOACTIVE, "Neutronium", false, 0xFFF0F0, 0xFAFAFA) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { - beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEUTRONIUM), 0.001f); + beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEUTRONIUM), 0.0001f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.HELLISH); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); beeSpecies.setIsSecret(); } @@ -1752,6 +1754,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { tMutation.requireResource(GregTech_API.sBlockMetal5, 2); } }, + //Twilight NAGA(GT_BranchDefinition.TWILIGHT, "Naga", true, 0x0D5A0D, 0x28874B) { @Override protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) { @@ -1759,7 +1762,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.NAGA), 0.10f); beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1781,7 +1784,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LICH), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.NORMAL); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1803,7 +1806,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.HYDRA), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.HELLISH); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); } @Override @@ -1825,21 +1828,21 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.URGHAST), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.HELLISH); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); + beeSpecies.setNocturnal(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(HYDRA.species, THAUMIUMDUST.species, 5); - tMutation.restrictTemperature(EnumTemperature.HELLISH); tMutation.requireResource(GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4); + tMutation.restrictTemperature(EnumTemperature.HELLISH); } }, SNOWQUEEN(GT_BranchDefinition.TWILIGHT, "SnowQueen", true, 0xD02001, 0x9C0018) { @@ -1849,21 +1852,21 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.SNOWQUEEN), 0.10f); beeSpecies.setHumidity(EnumHumidity.ARID); beeSpecies.setTemperature(EnumTemperature.ICY); - beeSpecies.hasEffect(); + beeSpecies.setHasEffect(); + beeSpecies.setNocturnal(); } @Override protected void setAlleles(IAllele[] template) { AlleleHelper.instance.set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST); AlleleHelper.instance.set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST); - AlleleHelper.instance.set(template, EnumBeeChromosome.NOCTURNAL, true); } @Override protected void registerMutations() { IBeeMutationCustom tMutation = registerMutation(getSpecies(MAGICBEES,"Supernatural"), NAGA.species, 4); - tMutation.restrictTemperature(EnumTemperature.ICY); tMutation.requireResource(GameRegistry.findBlock("thaumicbases", "blockSalisMundus"), 0); + tMutation.restrictTemperature(EnumTemperature.ICY); } }; private final GT_BranchDefinition branch; @@ -1882,10 +1885,11 @@ public enum GT_BeeDefinition implements IBeeDefinition { String lowercaseName = this.toString().toLowerCase(Locale.ENGLISH); String species = "species" + WordUtils.capitalize(lowercaseName); - String uid = "gregtech." + species; + String uid = "gregtech." + species;//TODO String uid = "gendustry.bee." + species; String description = "for.description." + species; String name = "for.bees.species." + lowercaseName; + this.branch = branch; this.species = BeeManager.beeFactory.createSpecies(uid, dominant, "GTNH", name, description, branch.getBranch(), binomial, primary, secondary); } diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index a47759ceae..b1bcdb97a0 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -873,6 +873,17 @@ for.bees.species.iridium=Iridium for.bees.species.uranium=Uranium for.bees.species.plutonium=Plutonium for.bees.species.naquadah=Naquadah +for.bees.species.naquadria=Naquadria +for.bees.species.dob=D-O-B +for.bees.species.thorium=Thorium +for.bees.species.lutetium=Lutetium +for.bees.species.americum=Americum +for.bees.species.neutronium=Neutronium +for.bees.species.naga=Naga +for.bees.species.lich=Lich +for.bees.species.hydra=Hydra +for.bees.species.urghast=Ur Ghast +for.bees.species.snowqueen=Snowqueen for.mutation.condition.biomeid=Required Biome for.mutation.condition.dim=Required Dimension |