apply review

Author: MrKono

src/main/java/com/github/gtexpert/gtbm/integration/gendustry/metatileentities/multiblock/MetaTileEntityMegaApiary.java

@@ -95,7 +95,7 @@ public class MetaTileEntityMegaApiary extends MultiblockWithDisplayBase implemen
 
     private EnergyContainerList energyContainer;
 
-    private static IBeekeepingMode mode;
+    private IBeekeepingMode mode;
 
     public MetaTileEntityMegaApiary(ResourceLocation metaTileEntityId) {
         super(metaTileEntityId);
@@ -423,30 +423,46 @@ private void processProducts() {
 
             primary.getProductChances().forEach((stack, f) -> {
                 float v = (speed + f + baseModifier + baseModifier * getMaxTier()) * applyBonus;
-                while (v > 1.0F) {
-                    int size = Math.min((int) v, 64);
-                    stack.setCount(size);
-                    products.add(stack);
-                    v -= size;
+                int amount = (int) v;
+                if (getWorld().rand.nextFloat() < v - amount) {
+                    amount++;
+                }
+                while (amount > 0) {
+                    ItemStack newStack = stack.copy();
+                    int stackSize = Math.min(amount, newStack.getMaxStackSize());
+                    newStack.setCount(stackSize);
+                    products.add(newStack);
+                    amount -= stackSize;
                 }
             });
+
             secondary.getProductChances().forEach((stack, f) -> {
                 float v = (speed + f + baseModifier + baseModifier * getMaxTier()) * applyBonus;
-                while (v > 1.0F) {
-                    int size = Math.min((int) v, 64);
-                    stack.setCount(size);
-                    products.add(stack);
-                    v -= size;
+                int amount = (int) v;
+                if (getWorld().rand.nextFloat() < v - amount) {
+                    amount++;
+                }
+                while (amount > 0) {
+                    ItemStack newStack = stack.copy();
+                    int stackSize = Math.min(amount, newStack.getMaxStackSize());
+                    newStack.setCount(stackSize);
+                    products.add(newStack);
+                    amount -= stackSize;
                 }
             });
 
             primary.getSpecialtyChances().forEach((stack, f) -> {
                 float v = (speed + f + baseModifier + baseModifier * getMaxTier()) * applyBonus;
-                while (v > 1.0F) {
-                    int size = Math.min((int) v, 64);
-                    stack.setCount(size);
-                    products.add(stack);
-                    v -= size;
+                int amount = (int) v;
+                if (getWorld().rand.nextFloat() < v - amount) {
+                    amount++;
+                }
+                while (amount > 0) {
+                    ItemStack newStack = stack.copy();
+                    int stackSize = Math.min(amount, newStack.getMaxStackSize());
+                    newStack.setCount(stackSize);
+                    products.add(newStack);
+                    amount -= stackSize;
                 }
             });
             royalJerry -= bonus;
@@ -530,7 +546,7 @@ protected void addDisplayText(List<ITextComponent> textList) {
                     for (ItemStack stack : merged) {
                         tl.add(TextComponentUtil.translationWithColor(
                                 TextFormatting.WHITE,
-                                "gtbm.multiblock.maga_apiary.outputs",
+                                "gtbm.multiblock.mega_apiary.outputs",
                                 TextComponentUtil.stringWithColor(
                                         TextFormatting.AQUA,
                                         stack.getDisplayName()),

src/main/resources/assets/gtbm/lang/en_us.lang

@@ -57,7 +57,7 @@ gtbm.multiblock.mega_apiary.tooltip.11=§eNote§7: When using §aauto-build§7,
 gtbm.multiblock.mega_apiary.queens=Queens: %s
 gtbm.multiblock.mega_apiary.jerry_body=Royal Jerry: %s
 gtbm.multiblock.mega_apiary.jerry_hover=Each Queen increases production by 5%% per Royal Jelly, up to a maximum of +200%%.
-gtbm.multiblock.maga_apiary.outputs=%s: §6x%s
+gtbm.multiblock.mega_apiary.outputs=%s: §6x%s
 
 # TOP
 gtbm.top.mega_apiary.queen=Queen:

src/main/resources/assets/gtbm/lang/ja_jp.lang

@@ -57,7 +57,7 @@ gtbm.multiblock.mega_apiary.tooltip.11=§e注意§7: §a自動建造§7を用い
 gtbm.multiblock.mega_apiary.queens=女王: %s
 gtbm.multiblock.mega_apiary.jerry_body=ローヤルゼリー: %s
 gtbm.multiblock.mega_apiary.jerry_hover=女王1匹につき、生産量がローヤルゼリー1個ごとに5%%増加する (最大 +200%%)。
-gtbm.multiblock.maga_apiary.outputs=%s: §6x%s
+gtbm.multiblock.mega_apiary.outputs=%s: §6x%s
 
 # TOP
 gtbm.top.mega_apiary.queen=女王: