Fix a bug when NBTString does not exist. (#54)

* Fix Alveary Simulation of Temperatures

* Spottless

* spotlessApply (#53)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:NotEnoughItems:2.2.7-GTNH:dev')
+    compile('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev')
     compile('com.github.GTNewHorizons:inventory-tweaks:1.5.14:api')
     compile('com.github.GTNewHorizons:BuildCraft:7.1.27:api')
     compile('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

src/main/java/forestry/api/apiculture/DefaultBeeModifier.java

@@ -43,6 +43,10 @@ public class DefaultBeeModifier implements IBeeModifier {
         return false;
     }
 
+    public boolean isSelfUnlighted() {
+        return false;
+    }
+
     public boolean isSunlightSimulated() {
         return false;
     }

src/main/java/forestry/api/apiculture/IBeeModifier.java

@@ -54,10 +54,17 @@ public interface IBeeModifier {
     boolean isSealed();
 
     /**
-     * @return Boolean indicating if housing can ignore darkness/night
+     * @return Boolean indicating if housing can ignore darkness/night. Cannot be used together with SelfUnlighted
      */
     boolean isSelfLighted();
 
+    /**
+     * @return Boolean indicating if housing can ignore lightness/day. Cannot be used together with SelfLighted
+     */
+    default boolean isSelfUnlighted() {
+        return false;
+    }
+
     /**
      * @return Boolean indicating if housing can ignore not seeing the sky
      */

src/main/java/forestry/api/apiculture/IHiveFrame.java

@@ -5,7 +5,12 @@
  ******************************************************************************/
 package forestry.api.apiculture;
 
+import java.util.List;
+
+import javax.annotation.Nullable;
+
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 
 public interface IHiveFrame {
 
@@ -22,4 +27,15 @@ public interface IHiveFrame {
     ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear);
 
     IBeeModifier getBeeModifier();
+
+    /**
+     * Provides an override for the "Hold Shift" tooltip info for a frame.<br>
+     * Called by {@link forestry.apiculture.EventHandlerApiculture#addFrameTooltip(ItemTooltipEvent)}.
+     *
+     * @return The info to display for this frame, or null if default generated info.
+     */
+    @Nullable
+    default List<String> getFrameTooltip() {
+        return null;
+    }
 }

src/main/java/forestry/apiculture/BeeHousingModifier.java

@@ -51,7 +51,7 @@ public class BeeHousingModifier implements IBeeModifier {
     public float getProductionModifier(IBeeGenome genome, final float currentModifier) {
         float modifierValue = 1.0f;
         for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
-            modifierValue *= modifier.getProductionModifier(genome, modifierValue * currentModifier);
+            modifierValue += modifier.getProductionModifier(genome, modifierValue + currentModifier);
         }
         return modifierValue;
     }
@@ -94,6 +94,16 @@ public class BeeHousingModifier implements IBeeModifier {
         return false;
     }
 
+    @Override
+    public boolean isSelfUnlighted() {
+        for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {
+            if (modifier.isSelfUnlighted()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean isSunlightSimulated() {
         for (IBeeModifier modifier : beeHousing.getBeeModifiers()) {

src/main/java/forestry/apiculture/EventHandlerApiculture.java

@@ -0,0 +1,103 @@
+package forestry.apiculture;
+
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import forestry.api.apiculture.IBeeModifier;
+import forestry.api.apiculture.IHiveFrame;
+import forestry.core.proxy.Proxies;
+import forestry.core.utils.StringUtil;
+
+public class EventHandlerApiculture {
+
+    @SubscribeEvent
+    public void addFrameTooltip(ItemTooltipEvent event) {
+        ItemStack itemStack = event.itemStack;
+        if (itemStack != null && itemStack.getItem() instanceof IHiveFrame) {
+            IHiveFrame frame = (IHiveFrame) itemStack.getItem();
+            IBeeModifier modifier = frame.getBeeModifier();
+            List<String> tooltip = event.toolTip;
+
+            if (!Proxies.common.isShiftDown()) {
+                tooltip.add(EnumChatFormatting.ITALIC + "<" + StringUtil.localize("gui.tooltip.tmi") + ">");
+            } else {
+                if (frame.getFrameTooltip() != null) {
+                    // use the override if it exists
+                    tooltip.addAll(frame.getFrameTooltip());
+                } else {
+                    // otherwise use the auto-generated info
+                    int durability = itemStack.getMaxDamage();
+                    tooltip.add(StringUtil.localize("frame.tooltip.durability") + getDurabilityFormatted(durability));
+
+                    float territory = modifier.getTerritoryModifier(null, 1.0F);
+                    tooltip.add(StringUtil.localize("frame.tooltip.territory") + getColorFormatted(territory));
+
+                    float mutation = modifier.getMutationModifier(null, null, 1.0F);
+                    tooltip.add(StringUtil.localize("frame.tooltip.mutationRate") + getColorFormatted(mutation));
+
+                    float lifespan = modifier.getLifespanModifier(null, null, 1.0F);
+                    tooltip.add(StringUtil.localize("frame.tooltip.lifespan") + getColorFormatted(lifespan));
+
+                    float production = modifier.getProductionModifier(null, 1.0F);
+                    tooltip.add(StringUtil.localize("frame.tooltip.production") + getColorFormatted(production, true));
+
+                    float decay = modifier.getGeneticDecay(null, 1.0F);
+                    tooltip.add(StringUtil.localize("frame.tooltip.geneticDecay") + getColorFormatted(decay));
+                }
+            }
+        }
+    }
+
+    private static String getDurabilityFormatted(int durability) {
+        EnumChatFormatting color;
+        if (durability < 100) {
+            color = EnumChatFormatting.DARK_RED;
+        } else if (durability < 200) {
+            color = EnumChatFormatting.RED;
+        } else if (durability < 250) {
+            color = EnumChatFormatting.GOLD;
+        } else if (durability < 750) {
+            color = EnumChatFormatting.GREEN;
+        } else {
+            color = EnumChatFormatting.AQUA;
+        }
+        return color + " " + durability;
+    }
+
+    private static String getColorFormatted(float value, boolean additive) {
+        EnumChatFormatting color;
+        if (value <= 0.5F) {
+            color = EnumChatFormatting.DARK_RED; // "bad" stat
+        } else if (value < 1.0F) {
+            color = EnumChatFormatting.RED; // "below average" stat
+        } else if (value == 1.0F) {
+            color = EnumChatFormatting.GOLD; // "average" stat
+        } else if (value <= 2.0F) {
+            color = EnumChatFormatting.GREEN; // "above average" stat
+        } else {
+            color = EnumChatFormatting.AQUA; // "great" stat
+        }
+        String formatted = color.toString();
+
+        // Set symbol for if this value is additive or multiplicative
+        if (additive) {
+            formatted += " +";
+        } else {
+            formatted += " x";
+        }
+
+        // trim trailing zeroes if no decimal-precision is needed
+        if (value == (long) value) {
+            return formatted + (long) value;
+        }
+        return formatted + value;
+    }
+
+    private static String getColorFormatted(float value) {
+        return getColorFormatted(value, false);
+    }
+}

src/main/java/forestry/apiculture/genetics/Bee.java

@@ -248,7 +248,7 @@ public class Bee extends IndividualLiving implements IBee {
 
         // / Night or darkness requires nocturnal species
         if (world.isDaytime()) {
-            if (!canWorkDuringDay()) {
+            if (!canWorkDuringDay(beeModifier)) {
                 errorStates.add(EnumErrorCode.NOT_NIGHT);
             }
         } else {
@@ -258,7 +258,7 @@ public class Bee extends IndividualLiving implements IBee {
         }
 
         if (housing.getBlockLightValue() > Constants.APIARY_MIN_LEVEL_LIGHT) {
-            if (!canWorkDuringDay()) {
+            if (!canWorkDuringDay(beeModifier)) {
                 errorStates.add(EnumErrorCode.NOT_GLOOMY);
             }
         } else {
@@ -308,12 +308,16 @@ public class Bee extends IndividualLiving implements IBee {
         return errorStates;
     }
 
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
     private boolean canWorkAtNight(IBeeModifier beeModifier) {
-        return genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted();
+        return (genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfLighted())
+                && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted());
     }
 
-    private boolean canWorkDuringDay() {
-        return !genome.getPrimary().isNocturnal() || genome.getNocturnal();
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    private boolean canWorkDuringDay(IBeeModifier beeModifier) {
+        return (!genome.getPrimary().isNocturnal() || genome.getNocturnal() || beeModifier.isSelfUnlighted())
+                && !(beeModifier.isSelfUnlighted() && beeModifier.isSelfLighted());
     }
 
     private boolean canWorkUnderground(IBeeModifier beeModifier) {
@@ -451,12 +455,11 @@ public class Bee extends IndividualLiving implements IBee {
     // / PRODUCTION
     @Override
     public ItemStack[] getProduceList() {
-        ArrayList<ItemStack> products = new ArrayList<>();
 
         IAlleleBeeSpecies primary = genome.getPrimary();
         IAlleleBeeSpecies secondary = genome.getSecondary();
 
-        products.addAll(primary.getProductChances().keySet());
+        ArrayList<ItemStack> products = new ArrayList<>(primary.getProductChances().keySet());
 
         Set<ItemStack> secondaryProducts = secondary.getProductChances().keySet();
         // Remove duplicates
@@ -475,13 +478,13 @@ public class Bee extends IndividualLiving implements IBee {
             }
         }
 
-        return products.toArray(new ItemStack[products.size()]);
+        return products.toArray(new ItemStack[0]);
     }
 
     @Override
     public ItemStack[] getSpecialtyList() {
         Set<ItemStack> specialties = genome.getPrimary().getSpecialtyChances().keySet();
-        return specialties.toArray(new ItemStack[specialties.size()]);
+        return specialties.toArray(new ItemStack[0]);
     }
 
     @Override
@@ -513,7 +516,6 @@ public class Bee extends IndividualLiving implements IBee {
         float speed = genome.getSpeed();
         float prodModifier = beeHousingModifier.getProductionModifier(genome, 1f)
                 * beeModeModifier.getProductionModifier(genome, 1f);
-        prodModifier /= 4f;
 
         // / Primary Products
         for (Map.Entry<ItemStack, Float> entry : primary.getProductChances().entrySet()) {
@@ -537,7 +539,7 @@ public class Bee extends IndividualLiving implements IBee {
             }
         }
 
-        ItemStack[] productsArray = products.toArray(new ItemStack[products.size()]);
+        ItemStack[] productsArray = products.toArray(new ItemStack[0]);
         ChunkCoordinates housingCoordinates = housing.getCoordinates();
         return genome.getFlowerProvider().affectProducts(
                 housing.getWorld(),
@@ -550,9 +552,9 @@ public class Bee extends IndividualLiving implements IBee {
 
     public static float getFinalChance(float chance, float beeSpeed, float productionModifier, float t) {
         chance *= 100f;
-        return (float) (((1f + t / 6f) * Math.sqrt(chance) * 2f * (1f + beeSpeed)
-                + Math.pow(productionModifier, Math.cbrt(chance))
-                - 3f) / 100f);
+        return (float) (2.8 * Math.pow(chance, 0.52)
+                * Math.pow((productionModifier + t), 0.52)
+                * Math.pow(beeSpeed, 0.37)) / 100.f;
     }
 
     /* REPRODUCTION */

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -414,7 +414,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         tempChange += change;
         tempChange = Math.max(boundaryDown - temperature, tempChange);
         tempChange = Math.min(boundaryUp - temperature, tempChange);
-        tempChange = (change > 0 && tempChange < 0) || (change < 0 && tempChange > 0) ? 0 : tempChange;
     }
 
     @Override
@@ -424,7 +423,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         humidChange += change;
         humidChange = Math.max(boundaryDown - humidity, humidChange);
         humidChange = Math.min(boundaryUp - humidity, humidChange);
-        humidChange = (change > 0 && humidChange < 0) || (change < 0 && humidChange > 0) ? 0 : humidChange;
     }
 
     /* GUI */

src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java

@@ -32,7 +32,7 @@ public class TileAlvearyFan extends TileAlvearyClimatiser {
 
         @Override
         public float getBoundaryDown() {
-            return 0.05f;
+            return -1f;
         }
 
         @Override

src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java

@@ -22,12 +22,12 @@ public class TileAlvearyHeater extends TileAlvearyClimatiser {
 
         @Override
         public float getChangePerTransfer() {
-            return 0.01f;
+            return 0.015f;
         }
 
         @Override
         public float getBoundaryUp() {
-            return 2.5f;
+            return 3.5f;
         }
 
         @Override

src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java

@@ -56,9 +56,9 @@ public class TileAlvearyHygroregulator extends TileAlveary
         this.tankManager = new TankManager(this, liquidTank);
 
         this.recipes = new HygroregulatorRecipe[] {
-                new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f),
-                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f),
-                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, 0.02f, -0.01f) };
+                new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f),
+                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
+                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
     }
 
     @Override

src/main/java/forestry/core/inventory/ItemInventory.java

@@ -106,7 +106,7 @@ public abstract class ItemInventory implements IInventory, IFilterSlotDelegate {
 
         String baseUID = base.getTagCompound().getString(KEY_UID);
         String comparisonUID = comparison.getTagCompound().getString(KEY_UID);
-        return baseUID != null && comparisonUID != null && baseUID.equals(comparisonUID);
+        return baseUID != null && !baseUID.isEmpty() && baseUID.equals(comparisonUID);
     }
 
     public void readFromNBT(NBTTagCompound nbt) {

src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java

@@ -109,7 +109,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
     public void loadUsageRecipes(FluidStack ingredient) {}
 
     @Override
-    public List<String> handleTooltip(GuiRecipe guiRecipe, List<String> currenttip, int recipe) {
+    public List<String> handleTooltip(GuiRecipe<?> guiRecipe, List<String> currenttip, int recipe) {
         super.handleTooltip(guiRecipe, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
@@ -125,7 +125,7 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
     }
 
     @Override
-    public List<String> handleItemTooltip(GuiRecipe guiRecipe, ItemStack itemStack, List<String> currenttip,
+    public List<String> handleItemTooltip(GuiRecipe<?> guiRecipe, ItemStack itemStack, List<String> currenttip,
             int recipe) {
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);

src/main/java/forestry/core/utils/BlockUtil.java

@@ -231,10 +231,14 @@ public abstract class BlockUtil {
 
     private static Class<? extends Block> BW_MetaGenerated_WerkstoffBlocksClass;
     private static Block BWBlocks;
-    private static boolean bw = Loader.isModLoaded("bartworks");
+    private static Class<? extends Block> GTBlockMachines_Class;
+    private static Block GTBlockMachines;
+    private static final boolean bw = Loader.isModLoaded("bartworks");
+    private static final boolean gt = Loader.isModLoaded("gregtech");
 
     static {
         if (bw) try {
+            // noinspection unchecked
             BW_MetaGenerated_WerkstoffBlocksClass = (Class<? extends Block>) Class
                     .forName("com.github.bartimaeusnek.bartworks.system.material.BW_MetaGenerated_WerkstoffBlocks");
             BWBlocks = (Block) Class.forName("com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader")
@@ -242,6 +246,13 @@ public abstract class BlockUtil {
         } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
         }
+        if (gt) try {
+            // noinspection unchecked
+            GTBlockMachines_Class = (Class<? extends Block>) Class.forName("gregtech.common.blocks.GT_Block_Machines");
+            GTBlockMachines = (Block) Class.forName("gregtech.api.GregTech_API").getField("sBlockMachines").get(null);
+        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException e) {
+            e.printStackTrace();
+        }
     }
 
     public static ItemStack getItemStackFromBlockBelow(World world, int x, int y, int z,
@@ -260,6 +271,10 @@ public abstract class BlockUtil {
             return new ItemStack(BWBlocks, 1, block.getDamageValue(world, x, y - depth, z));
         }
 
+        if (gt && GTBlockMachines_Class.isInstance(block)) {
+            return new ItemStack(GTBlockMachines, 1, block.getDamageValue(world, x, y - depth, z));
+        }
+
         return new ItemStack(block, 1, world.getBlockMetadata(x, y - depth, z));
     }
 }

src/main/java/forestry/plugins/PluginApiculture.java

@@ -60,6 +60,7 @@ import forestry.api.recipes.RecipeManagers;
 import forestry.api.storage.ICrateRegistry;
 import forestry.api.storage.StorageManager;
 import forestry.apiculture.ArmorApiaristHelper;
+import forestry.apiculture.EventHandlerApiculture;
 import forestry.apiculture.SaveEventHandlerApiculture;
 import forestry.apiculture.VillageHandlerApiculture;
 import forestry.apiculture.blocks.BlockAlveary;
@@ -185,6 +186,7 @@ public class PluginApiculture extends ForestryPlugin {
         super.preInit();
 
         MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandlerApiculture());
 
         blocks.apiculture.addDefinitions(
                 new MachineDefinition(BlockApicultureType.APIARY).setFaces(0, 1, 2, 2, 4, 4, 0, 7),

src/main/resources/assets/forestry/lang/en_US.lang

@@ -568,6 +568,13 @@ item.for.frameImpregnated.name=Impregnated Frame
 item.for.frameProven.name=Proven Frame
 item.for.frameUntreated.name=Untreated Frame
 
+for.frame.tooltip.durability=Durability:
+for.frame.tooltip.territory=Territory:
+for.frame.tooltip.mutationRate=Mutation Rate:
+for.frame.tooltip.lifespan=Lifespan:
+for.frame.tooltip.production=Production:
+for.frame.tooltip.geneticDecay=Genetic Decay:
+
 item.for.fruits.cherry.name=Cherry
 item.for.fruits.chestnut.name=Chestnut
 item.for.fruits.dates.name=Date