diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/common/items/ItemComb.java | 64 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java | 1 | ||||
| -rw-r--r-- | src/main/resources/assets/gregtech/lang/en_US.lang | 1 |
3 files changed, 41 insertions, 25 deletions
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 47f90bbb28..6082fa9c9e 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -197,54 +197,68 @@ public class ItemComb extends Item { //Gem Line tComb = getStackForType(CombType.STONE); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GraniteBlack,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.GraniteRed,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Basalt,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Marble,1), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Redrock,1), new int[] {7000, 5000, 5000, 5000, 5000, 5000}, 128, 5); - addProcessLV(tComb, Materials.Soapstone, 100); - addProcessLV(tComb, Materials.Talc, 100); - addProcessLV(tComb, Materials.Apatite, 100); - addProcessLV(tComb, Materials.Phosphate, 100); - addProcessLV(tComb, Materials.Phosphorus, 100); + addProcessLV(tComb, Materials.Soapstone, 95); + addProcessLV(tComb, Materials.Talc, 90); + addProcessLV(tComb, Materials.Apatite, 80); + addProcessLV(tComb, Materials.Phosphate, 75); + addProcessLV(tComb, Materials.Phosphorus, 75); tComb = getStackForType(CombType.CERTUS); addProcessLV(tComb, Materials.CertusQuartz, 100); - addProcessLV(tComb, Materials.Quartzite, 100); - addProcessLV(tComb, Materials.Barite, 100); + addProcessLV(tComb, Materials.Quartzite, 80); + addProcessLV(tComb, Materials.Barite, 75); tComb = getStackForType(CombType.FLUIX); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF,ItemList.FR_Wax.get(1, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Fluix,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {3000, 2500}, 128, 5); - addProcessLV(tComb, Materials.Redstone, 100); - addProcessLV(tComb, Materials.CertusQuartz, 100); - addProcessLV(tComb, Materials.NetherQuartz, 100); + addProcessLV(tComb, Materials.Redstone, 90); + addProcessLV(tComb, Materials.CertusQuartz, 90); + addProcessLV(tComb, Materials.NetherQuartz, 90); tComb = getStackForType(CombType.REDSTONE); addProcessLV(tComb, Materials.Redstone, 100); - addProcessLV(tComb, Materials.Cinnabar, 100); + addProcessLV(tComb, Materials.Cinnabar, 80); tComb = getStackForType(CombType.RAREEARTH); GT_Values.RA.addCentrifugeRecipe(tComb, GT_Values.NI, GT_Values.NF, GT_Values.NF,ItemList.FR_Wax.get(1, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.dustTiny,Materials.RareEarth,1), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, new int[] {3000, 10000}, 128, 5); tComb = getStackForType(CombType.LAPIS); addProcessLV(tComb, Materials.Lapis, 100); - addProcessLV(tComb, Materials.Sodalite, 100); - addProcessLV(tComb, Materials.Lazurite, 100); - addProcessLV(tComb, Materials.Calcite, 100); + addProcessLV(tComb, Materials.Sodalite, 90); + addProcessLV(tComb, Materials.Lazurite, 90); + addProcessLV(tComb, Materials.Calcite, 85); tComb = getStackForType(CombType.RUBY); addProcessLV(tComb, Materials.Ruby, 100); - addProcessLV(tComb, Materials.Redstone, 100); + addProcessLV(tComb, Materials.Redstone, 90); tComb = getStackForType(CombType.REDGARNET); addProcessLV(tComb, Materials.GarnetRed, 100); + addProcessLV(tComb, Materials.GarnetYellow, 75); + tComb = getStackForType(CombType.YELLOWGARNET); addProcessLV(tComb, Materials.GarnetYellow, 100); + addProcessLV(tComb, Materials.GarnetRed, 75); tComb = getStackForType(CombType.SAPPHIRE); addProcessLV(tComb, Materials.Sapphire, 100); - addProcessLV(tComb, Materials.GreenSapphire, 100); - addProcessLV(tComb, Materials.Almandine, 100); - addProcessLV(tComb, Materials.Pyrope, 100); + addProcessLV(tComb, Materials.GreenSapphire, 90); + addProcessLV(tComb, Materials.Almandine, 75); + addProcessLV(tComb, Materials.Pyrope, 75); tComb = getStackForType(CombType.DIAMOND); addProcessLV(tComb, Materials.Diamond, 100); - addProcessLV(tComb, Materials.Graphite, 100); + addProcessLV(tComb, Materials.Graphite, 75); tComb = getStackForType(CombType.OLIVINE); addProcessLV(tComb, Materials.Olivine, 100); - addProcessLV(tComb, Materials.Bentonite, 100); - addProcessLV(tComb, Materials.Magnesite, 100); - addProcessLV(tComb, Materials.Glauconite, 100); + addProcessLV(tComb, Materials.Bentonite, 90); + addProcessLV(tComb, Materials.Magnesite, 80); + addProcessLV(tComb, Materials.Glauconite, 75); tComb = getStackForType(CombType.EMERALD); addProcessLV(tComb, Materials.Emerald, 100); - addProcessLV(tComb, Materials.Beryllium, 100); - addProcessLV(tComb, Materials.Thorium, 100); - + addProcessLV(tComb, Materials.Beryllium, 85); + addProcessLV(tComb, Materials.Thorium, 75); + tComb = getStackForType(CombType.FIRESTONE); + addProcessLV(tComb, Materials.Firestone, 100); + tComb = getStackForType(CombType.PYROPE); + addProcessLV(tComb, Materials.Pyrope, 100); + addProcessLV(tComb, Materials.Aluminium, 75); + addProcessLV(tComb, Materials.Magnesium, 80); + addProcessLV(tComb, Materials.Silicon, 75); + tComb = getStackForType(CombType.GROSSULAR); + addProcessLV(tComb, Materials.Grossular, 100); + addProcessLV(tComb, Materials.Calcium, 80); + addProcessLV(tComb, Materials.Aluminium, 75); + addProcessLV(tComb, Materials.Silicon, 75); // // Metals Line tComb = getStackForType(CombType.SLAG); addSpecialCentLV(tComb, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1), 50,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteBlack, 1), 20,GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GraniteRed, 1), 20); diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index 3c03fe071d..d8b023d7ee 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1085,6 +1085,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(EnumHumidity.DAMP); beeSpecies.setTemperature(EnumTemperature.WARM); beeSpecies.setNocturnal(); + beeSpecies.hasEffect(); } @Override diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index b810dd5686..a37d7ae536 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -842,6 +842,7 @@ for.bees.species.redstone=Redstone for.bees.species.certus=Certus for.bees.species.fluix=Fluix for.bees.species.ruby=Ruby +for.bees.species.lapis=Lapis for.bees.species.sapphire=Sapphire for.bees.species.diamond=Diamond for.bees.species.olivine=Olivine |