fix incubator for real this time (#37)

* Remove outdated script

* updateBuildScript

* Update dependencies

* Fix NPE with Lumbermill

---------

Co-authored-by: Martin Robertz <[email protected]>

.github/scripts/test-no-error-reports.sh

@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-RUNDIR="run"
-CRASH="crash-reports"
-SERVERLOG="server.log"
-
-if [[ -d $RUNDIR/$CRASH ]]; then
-  echo "Crash reports detected:"
-  cat $RUNDIR/$CRASH/crash*.txt
-  exit 1
-fi
-
-if grep --quiet "Fatal errors were detected" $SERVERLOG; then
-  echo "Fatal errors detected:"
-  cat server.log
-  exit 1
-fi
-
-if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then
-  echo "Server force stopped:"
-  cat server.log
-  exit 1
-fi
-
-if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then
-  echo "Server didn't finish startup:"
-  cat server.log
-  exit 1
-fi
-
-echo "No crash reports detected"
-exit 0
-

dependencies.gradle

@@ -1,12 +1,11 @@
 // Add your dependencies here
 
 dependencies {
-	implementation('com.github.GTNewHorizons:GTNHLib:0.0.10:dev')
-	compile('com.github.GTNewHorizons:ForestryMC:4.5.6:dev')
-	compile('com.github.GTNewHorizons:NotEnoughItems:2.3.21-GTNH:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
+	implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
 
-	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.28:api')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.3.81-GTNH:dev')
 
+	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:api')
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
-	compileOnly('curse.maven:cofh-lib-220333:2388748')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

repositories.gradle

@@ -1,26 +1,4 @@
 // Add any additional repositories for your dependencies here
 
 repositories {
-	maven {
-		name 'GTNH Maven'
-		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
-		allowInsecureProtocol
-	}
-	maven {
-		name 'ic2'
-		url 'http://maven.ic2.player.to/'
-		metadataSources {
-			mavenPom()
-			artifact()
-		}
-	}
-	maven {
-		url 'https://cursemaven.com'
-		content {
-			includeGroup 'curse.maven'
-		}
-	}
-	maven {
-		url 'https://jitpack.io'
-	}
 }

src/main/java/binnie/botany/farm/GardenLogic.java

@@ -15,6 +15,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidStack;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.api.EnumAcidity;
@@ -23,9 +25,6 @@ import binnie.botany.api.EnumSoilType;
 import binnie.botany.api.gardening.IBlockSoil;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.gardening.Gardening;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.farming.FarmDirection;

src/main/java/binnie/botany/flower/BlockFlower.java

@@ -18,6 +18,8 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
 import binnie.botany.api.IFlower;
@@ -26,9 +28,6 @@ import binnie.botany.core.BotanyCore;
 import binnie.botany.gardening.Gardening;
 import binnie.botany.genetics.EnumFlowerType;
 import binnie.core.BinnieCore;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/binnie/botany/flower/ItemInsulatedTube.java

@@ -88,7 +88,7 @@ public class ItemInsulatedTube extends Item {
 
     enum Material {
 
-        Copper(0xe3b78e, "cooper"),
+        Copper(0xe3b78e, "copper"),
         Tin(0xe1eef4, "tin"),
         Bronze(0xddc276, "bronze"),
         Iron(0xd8d8d8, "iron");

src/main/java/binnie/botany/flower/TileEntityFlower.java

@@ -16,6 +16,8 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.EnumPlantType;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerStage;
@@ -33,9 +35,6 @@ import binnie.botany.genetics.EnumFlowerType;
 import binnie.botany.genetics.Flower;
 import binnie.botany.network.MessageFlowerUpdate;
 import binnie.core.BinnieCore;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.core.EnumHumidity;
 import forestry.api.core.EnumTemperature;
 import forestry.api.genetics.IIndividual;

src/main/java/binnie/botany/gardening/Gardening.java

@@ -13,6 +13,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumMoisture;
@@ -22,8 +24,6 @@ import binnie.botany.api.gardening.IBlockSoil;
 import binnie.botany.flower.TileEntityFlower;
 import binnie.botany.items.BotanyItems;
 import binnie.core.BinnieCore;
-
-import com.mojang.authlib.GameProfile;
 import forestry.api.core.EnumTemperature;
 
 public class Gardening {

src/main/java/binnie/botany/genetics/FlowerHelper.java

@@ -12,6 +12,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.Botany;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumFlowerStage;
@@ -22,9 +24,6 @@ import binnie.botany.api.IFlower;
 import binnie.botany.api.IFlowerGenome;
 import binnie.botany.api.IFlowerMutation;
 import binnie.botany.api.IFlowerRoot;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosomeType;

src/main/java/binnie/botany/genetics/FlowerSpecies.java

@@ -7,6 +7,8 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.botany.api.EnumAcidity;
 import binnie.botany.api.EnumFlowerChromosome;
 import binnie.botany.api.EnumMoisture;
@@ -16,9 +18,6 @@ import binnie.botany.api.IFlowerType;
 import binnie.botany.core.BotanyCore;
 import binnie.core.util.I18N;
 import binnie.genetics.genetics.AlleleHelper;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.EnumHumidity;

src/main/java/binnie/core/craftgui/database/ControlDatabaseIndividualDisplay.java

@@ -2,6 +2,8 @@ package binnie.core.craftgui.database;
 
 import net.minecraft.util.IIcon;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.craftgui.CraftGUI;
 import binnie.core.craftgui.ITooltip;
@@ -14,9 +16,6 @@ import binnie.core.craftgui.minecraft.Window;
 import binnie.core.craftgui.minecraft.control.ControlItemDisplay;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.util.I18N;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.ISpeciesRoot;

src/main/java/binnie/core/craftgui/database/ControlSpeciesBox.java

@@ -4,12 +4,11 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.listbox.ControlListBox;
 import binnie.core.craftgui.minecraft.Window;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IClassification;
 

src/main/java/binnie/core/craftgui/database/PageBreeder.java

@@ -2,6 +2,8 @@ package binnie.core.craftgui.database;
 
 import net.minecraft.util.EnumChatFormatting;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.ControlTextCentered;
 import binnie.core.craftgui.controls.page.ControlPage;
@@ -9,8 +11,6 @@ import binnie.core.craftgui.minecraft.Window;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.util.I18N;
 
-import com.mojang.authlib.GameProfile;
-
 public class PageBreeder extends ControlPage<DatabaseTab> {
 
     private GameProfile player;
@@ -54,7 +54,7 @@ public class PageBreeder extends ControlPage<DatabaseTab> {
                     this,
                     155.0f,
                     I18N.localise(
-                            "binniecore.gui.database.species.secretCount",
+                            "binniecore.gui.database.species.secretsCount",
                             system.discoveredSecretCount,
                             system.totalSecretCount));
         }

src/main/java/binnie/core/craftgui/database/WindowAbstractDatabase.java

@@ -6,6 +6,8 @@ import java.util.Map;
 
 import net.minecraft.entity.player.EntityPlayer;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.craftgui.IWidget;
 import binnie.core.craftgui.controls.ControlTextEdit;
 import binnie.core.craftgui.controls.listbox.ControlListBox;
@@ -28,9 +30,6 @@ import binnie.core.craftgui.window.Panel;
 import binnie.core.genetics.BreedingSystem;
 import binnie.core.util.I18N;
 import binnie.core.util.IValidator;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import forestry.api.genetics.IAlleleSpecies;
 import forestry.api.genetics.IBreedingTracker;

src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java

@@ -14,6 +14,8 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.BinnieCore;
 import binnie.core.craftgui.minecraft.control.ControlSlot;
 import binnie.core.craftgui.minecraft.control.EnumHighlighting;
@@ -30,8 +32,6 @@ import binnie.core.machines.power.ProcessInfo;
 import binnie.core.machines.power.TankInfo;
 import binnie.core.machines.transfer.TransferRequest;
 import binnie.core.network.packet.MessageContainerUpdate;
-
-import com.mojang.authlib.GameProfile;
 import cpw.mods.fml.relauncher.Side;
 
 public class ContainerCraftGUI extends Container {

src/main/java/binnie/core/craftgui/minecraft/Window.java

@@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.AbstractMod;
 import binnie.core.BinnieCore;
@@ -41,9 +43,6 @@ import binnie.core.machines.power.PowerSystem;
 import binnie.core.network.packet.MessageCraftGUI;
 import binnie.core.resource.BinnieResource;
 import binnie.core.resource.ResourceType;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/binnie/core/craftgui/resource/minecraft/CraftGUIResourceManager.java

@@ -15,18 +15,17 @@ import net.minecraft.util.ResourceLocation;
 
 import org.apache.commons.io.IOUtils;
 
-import binnie.core.craftgui.CraftGUI;
-import binnie.core.craftgui.geometry.IArea;
-import binnie.core.craftgui.geometry.IBorder;
-import binnie.core.craftgui.resource.Texture;
-import binnie.core.resource.IBinnieTexture;
-
 import com.google.common.base.Charsets;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 
+import binnie.core.craftgui.CraftGUI;
+import binnie.core.craftgui.geometry.IArea;
+import binnie.core.craftgui.geometry.IBorder;
+import binnie.core.craftgui.resource.Texture;
+import binnie.core.resource.IBinnieTexture;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/main/java/binnie/core/genetics/BeeModifierLogic.java

@@ -16,24 +16,40 @@ public class BeeModifierLogic {
     }
 
     public float getModifier(EnumBeeModifier modifier, float currentModifier) {
-        if (!modifiers.containsKey(modifier)) {
-            return 1.0f;
-        }
-
-        Float[] values = modifiers.get(modifier);
-        float mult = values[0];
-        float max = values[1];
-        if (max >= 1.0f) {
-            if (max <= currentModifier) {
+        if (modifier == EnumBeeModifier.PRODUCTION) {
+            if (!modifiers.containsKey(modifier)) {
+                return 0.0f;
+            }
+            Float[] values = modifiers.get(modifier);
+            float offset = values[0], max = values[1];
+            if (offset < 0) {// negative modifiers should always apply
+                return offset;
+            }
+            if (currentModifier >= max) {// don't decrease modifiers already over the max, just skip increasing it
+                return 0.0f;
+            }
+            return Math.min(offset, max - currentModifier);
+        } else {
+            if (!modifiers.containsKey(modifier)) {
                 return 1.0f;
             }
-            return Math.min(max / currentModifier, mult);
+
+            Float[] values = modifiers.get(modifier);
+            float mult = values[0];
+            float max = values[1];
+            if (max >= 1.0f) {
+                if (max <= currentModifier) {
+                    return 1.0f;
+                }
+                return Math.min(max / currentModifier, mult);
+            }
+
+            if (max >= currentModifier) {
+                return 1.0f;
+            }
+            return Math.max(max / currentModifier, mult);
         }
 
-        if (max >= currentModifier) {
-            return 1.0f;
-        }
-        return Math.max(max / currentModifier, mult);
     }
 
     public boolean getModifier(EnumBeeBooleanModifier modifier) {

src/main/java/binnie/core/genetics/BreedingSystem.java

@@ -15,13 +15,12 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.resource.BinnieIcon;
 import binnie.core.util.I18N;
 import binnie.extrabees.genetics.ExtraBeeMutation;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import forestry.api.core.ForestryEvent;
 import forestry.api.genetics.AlleleManager;

src/main/java/binnie/core/genetics/EnumBeeBooleanModifier.java

@@ -1,8 +1,15 @@
 package binnie.core.genetics;
 
+import binnie.core.util.I18N;
+
 public enum EnumBeeBooleanModifier {
+
     SEALED,
     SELF_LIGHTED,
     SUNLIGHT_STIMULATED,
-    HELLISH
+    HELLISH;
+
+    public String getName() {
+        return I18N.localise("binniecore.beebooleanmodifier." + name().toLowerCase());
+    }
 }

src/main/java/binnie/core/genetics/TreeBreedingSystem.java

@@ -16,6 +16,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.util.I18N;
 import binnie.core.util.UniqueItemStackSet;
@@ -23,9 +25,6 @@ import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.FakeWorld;
 import binnie.extratrees.machines.lumbermill.Lumbermill;
 import binnie.genetics.genetics.AlleleHelper;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.arboriculture.EnumGermlingType;
 import forestry.api.arboriculture.EnumTreeChromosome;
 import forestry.api.arboriculture.IAlleleFruit;

src/main/java/binnie/core/machines/Machine.java

@@ -14,6 +14,8 @@ import net.minecraft.network.Packet;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.BinnieCore;
 import binnie.core.machines.component.IInteraction;
 import binnie.core.machines.component.IRender;
@@ -22,9 +24,6 @@ import binnie.core.network.BinnieCorePacketID;
 import binnie.core.network.INetworkedEntity;
 import binnie.core.network.packet.MessageTileNBT;
 import binnie.core.network.packet.PacketPayload;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import forestry.api.core.INBTTagable;
 

src/main/java/binnie/core/machines/transfer/TransferRequest.java

@@ -122,7 +122,7 @@ public class TransferRequest {
                             || ((IInventorySlots) destination).getSlot(slot) == null
                             || !((IInventorySlots) destination).getSlot(slot).isRecipe()) {
                         if (destination.getStackInSlot(slot) != null) {
-                            if (item.isStackable()) {
+                            if (item.isStackable() && destination.getInventoryStackLimit() > 1) {
                                 ItemStack merged = destination.getStackInSlot(slot).copy();
                                 ItemStack[] newStacks = mergeStacks(item.copy(), merged.copy());
                                 item = newStacks[0];
@@ -149,7 +149,16 @@ public class TransferRequest {
                         if (destination.getStackInSlot(slot) == null) {
                             insertedSlots.add(new TransferSlot(slot, destination));
                             if (doAdd) {
-                                destination.setInventorySlotContents(slot, item.copy());
+                                ItemStack movedStack = item.copy();
+                                if (movedStack.stackSize > destination.getInventoryStackLimit()) {
+                                    movedStack.stackSize = destination.getInventoryStackLimit();
+                                }
+                                item.stackSize -= movedStack.stackSize;
+                                destination.setInventorySlotContents(slot, movedStack);
+                                if (item.stackSize <= 0) {
+                                    item = null;
+                                }
+                                return item;
                             }
                             return null;
                         }

src/main/java/binnie/extrabees/apiary/ComponentBeeModifier.java

@@ -33,7 +33,7 @@ public class ComponentBeeModifier extends MachineComponent implements IBeeModifi
 
     @Override
     public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-        return 1.0f;
+        return 0.0f;
     }
 
     @Override

src/main/java/binnie/extrabees/apiary/EnumHiveFrame.java

@@ -36,17 +36,17 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
 
     public static void init() {
         EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.25f);
-        EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
+        EnumHiveFrame.Cocoa.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.5f, 2.0f);// was 1.5x lim 5.0x
         EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.TERRITORY, 0.5f, 0.1f);
         EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
-        EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.5f);
+        EnumHiveFrame.Cage.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.5x
         EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
         EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.75f, 0.5f);
-        EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.25f, 0.1f);
+        EnumHiveFrame.Soul.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.75f, 0.0f);// was 0.25x lim 0.1x
         EnumHiveFrame.Soul.setMaxDamage(80);
         EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
         EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.MUTATION, 0.5f, 0.2f);
-        EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.75f, 0.2f);
+        EnumHiveFrame.Clay.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.25f, 0.0f);// was 0.75x lim 0.2x
         EnumHiveFrame.Debug.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.0E-4f, 1.0E-4f);
 
         GameRegistry.addRecipe(

src/main/java/binnie/extrabees/apiary/TileExtraBeeAlveary.java

@@ -7,11 +7,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChunkCoordinates;
 
-import binnie.core.machines.TileEntityMachine;
-import binnie.extrabees.apiary.machine.AlvearyMachine;
-
 import com.mojang.authlib.GameProfile;
 
+import binnie.core.machines.TileEntityMachine;
+import binnie.extrabees.apiary.machine.AlvearyMachine;
 import forestry.api.apiculture.IBeeGenome;
 import forestry.api.apiculture.IBeeListener;
 import forestry.api.apiculture.IBeeModifier;
@@ -153,7 +152,7 @@ public class TileExtraBeeAlveary extends TileEntityMachine implements IAlvearyCo
     @Override
     public float getProductionModifier(IBeeGenome genome, float currentModifier) {
         if (getBeeModifier() == null) {
-            return 1.0f;
+            return 0.0f;
         }
         return getBeeModifier().getProductionModifier(genome, currentModifier);
     }

src/main/java/binnie/extrabees/apiary/machine/AlvearyMachine.java

@@ -18,6 +18,7 @@ import binnie.extrabees.apiary.machine.mutator.MutatorAlvearyPackage;
 import binnie.extrabees.apiary.machine.rainShield.RainShieldAlvearyPackage;
 import binnie.extrabees.apiary.machine.stimulator.StimulatorAlvearyPackage;
 import binnie.extrabees.apiary.machine.transmission.TransmissionAlvearyPackage;
+import binnie.extrabees.apiary.machine.unlighting.UnlightingAlvearyPackage;
 
 public enum AlvearyMachine implements IMachineType {
 
@@ -27,7 +28,8 @@ public enum AlvearyMachine implements IMachineType {
     Lighting(LightingAlvearyPackage.class),
     Stimulator(StimulatorAlvearyPackage.class),
     Hatchery(HatcheryAlvearyPackage.class),
-    Transmission(TransmissionAlvearyPackage.class);
+    Transmission(TransmissionAlvearyPackage.class),
+    Unlighting(UnlightingAlvearyPackage.class);
 
     protected Class<? extends MachinePackage> cls;
 

src/main/java/binnie/extrabees/apiary/machine/frame/FrameComponentModifier.java

@@ -72,7 +72,7 @@ public class FrameComponentModifier extends ComponentBeeModifier implements IBee
     public float getProductionModifier(IBeeGenome genome, float currentModifier) {
         IHiveFrame frame = getHiveFrame();
         if (frame == null) {
-            return 1.0f;
+            return 0.0f;
         }
         return frame.getBeeModifier().getProductionModifier(genome, currentModifier);
     }

src/main/java/binnie/extrabees/apiary/machine/stimulator/CircuitType.java

@@ -20,15 +20,17 @@ public enum CircuitType implements IBeeModifier {
     Territory(2, 10);
 
     static {
-        CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 5.0f);
-        CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 2.5f, 10.0f);
+        CircuitType.LowVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.5f, 5.0f);
+        CircuitType.HighVoltage.logic.setModifier(EnumBeeModifier.PRODUCTION, 1.5f, 10.0f);
         CircuitType.Plant.logic.setModifier(EnumBeeModifier.FLOWERING, 1.5f, 5.0f);
         CircuitType.Death.logic.setModifier(EnumBeeModifier.LIFESPAN, 0.8f, 0.2f);
         CircuitType.Life.logic.setModifier(EnumBeeModifier.LIFESPAN, 1.5f, 5.0f);
         CircuitType.Nether.logic.setModifier(EnumBeeBooleanModifier.HELLISH);
         CircuitType.Mutation.logic.setModifier(EnumBeeModifier.MUTATION, 1.5f, 5.0f);
         CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.TERRITORY, 0.4f, 0.1f);
-        CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, 0.9f, 0.5f);
+        CircuitType.Inhibitor.logic.setModifier(EnumBeeModifier.PRODUCTION, -0.1f, 0.0f);// was 0.9x, now -0.1. limit
+                                                                                         // was 0.5x, now it's 0, but
+                                                                                         // currently ignored
         CircuitType.Territory.logic.setModifier(EnumBeeModifier.TERRITORY, 1.5f, 5.0f);
         for (CircuitType type : values()) {
             type.logic.setModifier(EnumBeeModifier.GENETIC_DECAY, 1.5f, 10.0f);
@@ -48,18 +50,34 @@ public enum CircuitType implements IBeeModifier {
 
     public void createCircuit(ICircuitLayout layout) {
         StimulatorCircuit circuit = new StimulatorCircuit(this, layout);
-        for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
-            float mod = logic.getModifier(modifier, 1.0f);
-            if (mod == 1.0f) {
-                continue;
+        for (EnumBeeBooleanModifier modifier : EnumBeeBooleanModifier.values()) {
+            if (logic.getModifier(modifier)) {
+                circuit.addTooltipString("Enables " + modifier.getName());
             }
-
-            if (mod > 1.0f) {
-                int increase = (int) ((mod - 1.0f) * 100.0f);
-                circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
+        }
+        for (EnumBeeModifier modifier : EnumBeeModifier.values()) {
+            if (modifier == EnumBeeModifier.PRODUCTION) {
+                float mod = logic.getModifier(modifier, 0.0f);
+                if (mod == 0.0f) {
+                    continue;
+                }
+                if (mod > 0.0f) {
+                    circuit.addTooltipString("Increases " + modifier.getName() + " by +" + mod);
+                } else {
+                    circuit.addTooltipString("Increases " + modifier.getName() + " by " + mod);
+                }
             } else {
-                int decrease = (int) ((1.0f - mod) * 100.0f);
-                circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
+                float mod = logic.getModifier(modifier, 1.0f);
+                if (mod == 1.0f) {
+                    continue;
+                }
+                if (mod > 1.0f) {
+                    int increase = (int) ((mod - 1.0f) * 100.0f);
+                    circuit.addTooltipString("Increases " + modifier.getName() + " by " + increase + "%");
+                } else {
+                    int decrease = (int) ((1.0f - mod) * 100.0f);
+                    circuit.addTooltipString("Decreases " + modifier.getName() + " by " + decrease + "%");
+                }
             }
         }
     }

src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorAlvearyPackage.java

@@ -18,7 +18,13 @@ public class StimulatorAlvearyPackage extends AlvearyMachine.AlvearyPackage impl
     @Override
     public void createMachine(Machine machine) {
         new ComponentExtraBeeGUI(machine, ExtraBeeGUID.AlvearyStimulator);
-        ComponentInventorySlots inventory = new ComponentInventorySlots(machine);
+        ComponentInventorySlots inventory = new ComponentInventorySlots(machine) {
+
+            @Override
+            public int getInventoryStackLimit() {
+                return 1;
+            }
+        };
         inventory.addSlot(AlvearyStimulator.SLOT_CIRCUIT, "circuit");
         inventory.getSlot(AlvearyStimulator.SLOT_CIRCUIT).setValidator(new CircuitSlotValidator());
         new ComponentPowerReceptor(machine);

src/main/java/binnie/extrabees/apiary/machine/stimulator/StimulatorModifierComponent.java

@@ -100,13 +100,14 @@ public class StimulatorModifierComponent extends ComponentBeeModifier implements
 
     @Override
     public float getProductionModifier(IBeeGenome genome, float currentModifier) {
-        float mod = 1.0f;
+        float mod = 0.0f;// production modifiers are now additive, and the "base" value of 1 comes in forestry's
+                         // Bee.java and BeeKeepingMode.java
         if (!powered) {
             return mod;
         }
 
         for (IBeeModifier beeMod : modifiers) {
-            mod *= beeMod.getProductionModifier(genome, mod);
+            mod += beeMod.getProductionModifier(genome, mod);
         }
         return mod;
     }

src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingAlvearyPackage.java

@@ -0,0 +1,18 @@
+package binnie.extrabees.apiary.machine.unlighting;
+
+import binnie.core.craftgui.minecraft.IMachineInformation;
+import binnie.core.machines.Machine;
+import binnie.extrabees.apiary.machine.AlvearyMachine;
+import binnie.extrabees.core.ExtraBeeTexture;
+
+public class UnlightingAlvearyPackage extends AlvearyMachine.AlvearyPackage implements IMachineInformation {
+
+    public UnlightingAlvearyPackage() {
+        super("unlighting", ExtraBeeTexture.AlvearyUnlighting.getTexture(), false);
+    }
+
+    @Override
+    public void createMachine(Machine machine) {
+        new UnlightingComponentModifier(machine);
+    }
+}

src/main/java/binnie/extrabees/apiary/machine/unlighting/UnlightingComponentModifier.java

@@ -0,0 +1,18 @@
+package binnie.extrabees.apiary.machine.unlighting;
+
+import binnie.core.machines.Machine;
+import binnie.extrabees.apiary.ComponentBeeModifier;
+import forestry.api.apiculture.IBeeListener;
+import forestry.api.apiculture.IBeeModifier;
+
+public class UnlightingComponentModifier extends ComponentBeeModifier implements IBeeModifier, IBeeListener {
+
+    public UnlightingComponentModifier(Machine machine) {
+        super(machine);
+    }
+
+    @Override
+    public boolean isSelfUnlighted() {
+        return true;
+    }
+}

src/main/java/binnie/extrabees/core/ExtraBeeTexture.java

@@ -12,6 +12,7 @@ public enum ExtraBeeTexture implements IBinnieTexture {
     AlvearyNovaBlock(ResourceType.Tile, "alveary/AlvearyNovaBlock"),
     AlvearyFrame(ResourceType.Tile, "alveary/AlvearyFrame"),
     AlvearyLighting(ResourceType.Tile, "alveary/AlvearyLighting"),
+    AlvearyUnlighting(ResourceType.Tile, "alveary/AlvearyUnlighting"),
     AlvearyRainShield(ResourceType.Tile, "alveary/AlvearyRainShield"),
     AlvearyStimulator(ResourceType.Tile, "alveary/AlvearyStimulator"),
     AlvearyHatchery(ResourceType.Tile, "alveary/AlvearyHatchery"),

src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java

@@ -1709,7 +1709,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
                                     "Alrightsc",
                                     "YeetYeetDatBoi",
                                     "DreamMasterXXL",
-                                    "Colen"));
+                                    "Colen",
+                                    "OrderedSet"));
         }
     },
 

src/main/java/binnie/extratrees/FakeWorld.java

@@ -13,10 +13,10 @@ import net.minecraft.world.WorldSettings.GameType;
 import net.minecraft.world.WorldType;
 import net.minecraft.world.chunk.IChunkProvider;
 
-import sun.misc.Unsafe;
 import binnie.core.block.TileEntityMetadata;
 import forestry.api.arboriculture.EnumWoodType;
 import forestry.arboriculture.tiles.TileWood;
+import sun.misc.Unsafe;
 
 public class FakeWorld extends World {
 

src/main/java/binnie/extratrees/block/PlankType.java

@@ -8,14 +8,14 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import com.google.common.base.Optional;
+
 import binnie.core.Mods;
 import binnie.core.block.TileEntityMetadata;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.api.CarpentryManager;
 
-import com.google.common.base.Optional;
-
 public class PlankType {
 
     public static void setup() {

src/main/java/binnie/extratrees/genetics/ButterflySpecies.java

@@ -10,15 +10,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.BiomeDictionary;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.Mods;
 import binnie.core.resource.BinnieResource;
 import binnie.core.resource.ResourceType;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.core.EnumHumidity;

src/main/java/binnie/extratrees/genetics/ExtraTreeFruitGene.java

@@ -11,15 +11,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import com.gtnewhorizon.gtnhlib.reflect.Fields;
+
 import binnie.Binnie;
 import binnie.core.util.I18N;
 import binnie.extratrees.ExtraTrees;
 import binnie.extratrees.block.FruitPod;
 import binnie.extratrees.config.ConfigurationMain;
 import binnie.extratrees.item.Food;
-
-import com.gtnewhorizon.gtnhlib.reflect.Fields;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.arboriculture.EnumTreeChromosome;

src/main/java/binnie/extratrees/genetics/ExtraTreeSpecies.java

@@ -13,6 +13,8 @@ import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import net.minecraftforge.common.EnumPlantType;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.Binnie;
 import binnie.core.Mods;
 import binnie.core.util.I18N;
@@ -78,9 +80,6 @@ import binnie.extratrees.worldgen.WorldGenWesternHemlock;
 import binnie.extratrees.worldgen.WorldGenWhitebeam;
 import binnie.extratrees.worldgen.WorldGenYew;
 import binnie.genetics.genetics.AlleleHelper;
-
-import com.mojang.authlib.GameProfile;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import forestry.api.apiculture.EnumBeeChromosome;
@@ -565,7 +564,7 @@ public enum ExtraTreeSpecies implements IAlleleTreeSpecies, IIconProvider, IGerm
                 .setMaturation(EnumAllele.Maturation.SLOWEST);
 
         ExtraTreeSpecies.SwampGum.addFamily(familyJungle).setLeafType(LeafType.JUNGLE)
-                .setHeight(EnumAllele.Height.SMALLEST).setFertility(EnumAllele.Saplings.LOWEST)
+                .setHeight(EnumAllele.Height.LARGEST).setFertility(EnumAllele.Saplings.LOWEST)
                 .setMaturation(EnumAllele.Maturation.SLOWER).setGirth(2);
 
         ExtraTreeSpecies.Box.addFamily(familyPome).addFamily(familyPrune).addFamily(familyNuts).addFamily(familyCitrus)

src/main/java/binnie/extratrees/machines/lumbermill/Lumbermill.java

@@ -29,19 +29,18 @@ public class Lumbermill {
     public static Map<ItemStack, ItemStack> recipes = new HashMap<>();
 
     public static ItemStack getPlankProduct(ItemStack item) {
-        ItemStack stack = null;
         if (Lumbermill.recipes.isEmpty()) {
             calculateLumbermillProducts();
         }
 
         for (Map.Entry<ItemStack, ItemStack> entry : Lumbermill.recipes.entrySet()) {
             if (entry.getKey().isItemEqual(item)) {
-                stack = entry.getValue().copy();
-                break;
+                ItemStack stack = entry.getValue().copy();
+                stack.stackSize = 6;
+                return stack;
             }
         }
-        stack.stackSize = 6;
-        return stack;
+        return null;
     }
 
     public static void calculateLumbermillProducts() {

src/main/java/binnie/extratrees/worldgen/DefaultTreeGenerator.java

@@ -5,10 +5,9 @@ import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import binnie.extratrees.genetics.ExtraTreeSpecies;
-
 import com.mojang.authlib.GameProfile;
 
+import binnie.extratrees.genetics.ExtraTreeSpecies;
 import forestry.api.arboriculture.ITreeGenerator;
 import forestry.api.arboriculture.ITreeGenome;
 import forestry.api.world.ITreeGenData;

src/main/java/binnie/genetics/genetics/GeneTracker.java

@@ -9,14 +9,13 @@ import net.minecraft.nbt.NBTTagString;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSavedData;
 
+import com.mojang.authlib.GameProfile;
+
 import binnie.core.genetics.Gene;
 import binnie.core.network.packet.MessageNBT;
 import binnie.genetics.Genetics;
 import binnie.genetics.api.IGene;
 import binnie.genetics.core.GeneticsPacket;
-
-import com.mojang.authlib.GameProfile;
-
 import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.api.genetics.IChromosomeType;

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

@@ -182,7 +182,12 @@ binniecore.beemodifier.mutation=Mutation
 binniecore.beemodifier.lifespan=Lifespan
 binniecore.beemodifier.production=Production
 binniecore.beemodifier.flowering=Flowering
-binniecore.beemodifier.geneticdecay=Genetic Decay
+binniecore.beemodifier.genetic_decay=Genetic Decay
+
+binniecore.beebooleanmodifier.sealed=Rain Protection
+binniecore.beebooleanmodifier.self_lighted=Self Lighting
+binniecore.beebooleanmodifier.sunlight_stimulated=Sunlight Stimulation
+binniecore.beebooleanmodifier.hellish=Hellish Emulation
 
 binniecore.gui.breedingmessage.species=Species Discovered
 binniecore.gui.breedingmessage.branch=Branch Discovered

src/main/resources/assets/binniecore/lang/ru_RU.lang

@@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=Мутация
 binniecore.beemodifier.lifespan=Время жизни
 binniecore.beemodifier.production=Продукция
 binniecore.beemodifier.flowering=Цветы
-binniecore.beemodifier.geneticdecay=Склонность к вырождению
+binniecore.beemodifier.genetic_decay=Склонность к вырождению
 
 binniecore.gui.breedingmessage.species=Видов обнаружено
 binniecore.gui.breedingmessage.branch=Семейств обнаружено

src/main/resources/assets/binniecore/lang/zh_CN.lang

@@ -182,7 +182,7 @@ binniecore.beemodifier.mutation=变异
 binniecore.beemodifier.lifespan=寿命
 binniecore.beemodifier.production=产物
 binniecore.beemodifier.flowering=授粉速度
-binniecore.beemodifier.geneticdecay=基因衰变
+binniecore.beemodifier.genetic_decay=基因衰变
 
 binniecore.gui.breedingmessage.species=已发现品种
 binniecore.gui.breedingmessage.branch=已发现分支

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

@@ -366,7 +366,7 @@ for.binnie.circuit.garden.damp.neutral=Garden (Damp, Neutral)
 for.binnie.circuit.garden.damp.alkaline=Garden (Damp, Alkaline)
 
 botany.tube.name=Insulated Tube
-botany.tube.cooper=Cooper
+botany.tube.copper=Copper
 botany.tube.tin=Tin
 botany.tube.bronze=Bronze
 botany.tube.iron=Iron

src/main/resources/assets/botany/lang/ru_RU.lang

@@ -366,7 +366,7 @@ for.binnie.circuit.garden.damp.neutral=Сад (влажный, нейтраль
 for.binnie.circuit.garden.damp.alkaline=Сад (влажный, щелочной)
 
 botany.tube.name=изолирующая лампа
-botany.tube.cooper=Медная
+botany.tube.copper=Медная
 botany.tube.tin=Оловяная
 botany.tube.bronze=Бронзовая
 botany.tube.iron=Железная

src/main/resources/assets/botany/lang/zh_CN.lang

@@ -364,7 +364,7 @@ for.binnie.circuit.garden.damp.neutral=花土(潮湿，中性)
 for.binnie.circuit.garden.damp.alkaline=花土(潮湿，碱性)
 
 botany.tube.name=恒温管
-botany.tube.cooper=铜
+botany.tube.copper=铜
 botany.tube.tin=锡
 botany.tube.bronze=青铜
 botany.tube.iron=铁

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

@@ -191,6 +191,9 @@ extrabees.machine.alveay.frame.tooltip=Hive Frames
 extrabees.machine.alveay.lighting=Alveary Lighting
 extrabees.machine.alveay.lighting.info=The Alveary Lighting tricks bees into thinking it is daylight at night time.
 
+extrabees.machine.alveay.unlighting=Alveary Unlighting
+extrabees.machine.alveay.unlighting.info=The Alveary Unlighting tricks bees into thinking it is night time during the day.
+
 extrabees.machine.alveay.mutator=Mutator
 extrabees.machine.alveay.mutator.info=The Mutator uses certain items in order to encourage bee mutation.
 extrabees.machine.alveay.mutator.tooltip=Mutagenic Agents