diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-07-15 00:49:50 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-07-16 17:27:03 +0200 |
| commit | 720d5672bef8891a6e982b637cbffc0e76411e2c (patch) | |
| tree | 95373314770bf5aac19137880b20b4ccbc88f1fd /src/main/java | |
| parent | 5797c19186d297340b872d1c81e5f23f8a7ca1ea (diff) | |
| download | GT5-Unofficial-720d5672bef8891a6e982b637cbffc0e76411e2c.tar.gz GT5-Unofficial-720d5672bef8891a6e982b637cbffc0e76411e2c.tar.bz2 GT5-Unofficial-720d5672bef8891a6e982b637cbffc0e76411e2c.zip | |
cherry pick
f7e33fd402e4212518485d5650e1c0ecaac82937
Capped the output multiplier of stone dust to 100%.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 5eed53c865..aa9e8cb685 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -493,7 +493,7 @@ public class GT_Mod implements IGT_Mod { if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "SolarPanelUV", false)) { GT_ModHandler.addCraftingRecipe(ItemList.Cover_SolarPanel_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" S ", "STS", " S ", 'S', ItemList.Cover_SolarPanel_ZPM, 'T', ItemList.Transformer_UV_ZPM}); } - double outputMultiplier = GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "StoneDustOutputMultiplier", 0.6); + double outputMultiplier = Math.min(GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "StoneDustOutputMultiplier", 0.6), 1.0); if (GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "StoneDustCentrifugation", false)) { int fullChance = (int)(10000 * outputMultiplier); int[] chances = new int[]{fullChance, fullChance, fullChance, fullChance, fullChance, (int)(5500 * outputMultiplier)}; |