mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-17 19:15:24 +00:00
Fix #320 Disabled module causes crash on startup
This commit is contained in:
1 parent
c6eaf3010c
commit
59c409b4bb
3 files changed
+29
-21
No files matched your search
@@ -1,6 +1,5 @@
|
||||
package binnie.botany;
|
||||
|
||||
import binnie.genetics.api.analyst.IAnalystManager;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.SidedProxy;
|
||||
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
@@ -17,11 +16,14 @@ import binnie.core.BinnieCore;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
import binnie.core.modules.BlankModuleContainer;
|
||||
import binnie.core.modules.BotanyModuleUIDs;
|
||||
import binnie.core.modules.ModuleManager;
|
||||
import binnie.core.network.BinniePacketHandler;
|
||||
import binnie.core.network.IPacketID;
|
||||
import binnie.core.proxy.IProxyCore;
|
||||
import binnie.genetics.api.GeneticsApi;
|
||||
import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
|
||||
import binnie.genetics.api.analyst.IAnalystManager;
|
||||
|
||||
@Mod(
|
||||
modid = Constants.BOTANY_MOD_ID,
|
||||
@@ -50,11 +52,13 @@ public class Botany extends BlankModuleContainer {
|
||||
analystManager.registerAnalystPagePlugin(new FlowerAnalystPagePlugin());
|
||||
}
|
||||
|
||||
IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager;
|
||||
if(acclimatiserManager != null) {
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh());
|
||||
if(ModuleManager.isModuleEnabled(Constants.BOTANY_MOD_ID, BotanyModuleUIDs.FLOWERS)) {
|
||||
IAcclimatiserManager acclimatiserManager = GeneticsApi.acclimatiserManager;
|
||||
if (acclimatiserManager != null) {
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.HUMIDITY_TOLERANCE, acclimatiserManager.getHumidityToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.TEMPERATURE_TOLERANCE, acclimatiserManager.getTemperatureToleranceType());
|
||||
acclimatiserManager.addTolerance(EnumFlowerChromosome.PH_TOLERANCE, new TolerancePh());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,17 +1,5 @@
|
||||
package binnie.genetics;
|
||||
|
||||
import binnie.core.machines.errors.ErrorStateRegistry;
|
||||
import binnie.genetics.api.GeneticsApi;
|
||||
import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
|
||||
import binnie.genetics.api.analyst.IAnalystManager;
|
||||
import binnie.genetics.core.GeneticsTexture;
|
||||
import binnie.genetics.genetics.TreeBreedingSystem;
|
||||
import binnie.genetics.gui.Icons;
|
||||
import binnie.genetics.gui.analyst.AnalystManager;
|
||||
import binnie.genetics.gui.analyst.GeneticsProducePlugin;
|
||||
import binnie.genetics.machine.GeneticsErrorCode;
|
||||
import binnie.genetics.machine.acclimatiser.AcclimatiserManager;
|
||||
import binnie.genetics.machine.sequencer.Sequencer;
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
@@ -22,19 +10,31 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.Constants;
|
||||
import binnie.core.gui.IBinnieGUID;
|
||||
import binnie.core.machines.errors.ErrorStateRegistry;
|
||||
import binnie.core.network.BinniePacketHandler;
|
||||
import binnie.core.network.IPacketID;
|
||||
import binnie.core.proxy.IProxyCore;
|
||||
import binnie.genetics.api.GeneticsApi;
|
||||
import binnie.genetics.api.acclimatiser.IAcclimatiserManager;
|
||||
import binnie.genetics.api.analyst.IAnalystManager;
|
||||
import binnie.genetics.core.GeneticsGUI;
|
||||
import binnie.genetics.core.GeneticsPacket;
|
||||
import binnie.genetics.core.GeneticsTexture;
|
||||
import binnie.genetics.genetics.TreeBreedingSystem;
|
||||
import binnie.genetics.gui.Icons;
|
||||
import binnie.genetics.gui.analyst.AnalystManager;
|
||||
import binnie.genetics.gui.analyst.GeneticsProducePlugin;
|
||||
import binnie.genetics.item.ItemPunnettSquare;
|
||||
import binnie.genetics.item.ModuleItems;
|
||||
import binnie.genetics.machine.GeneticsErrorCode;
|
||||
import binnie.genetics.machine.ModuleMachine;
|
||||
import binnie.genetics.machine.acclimatiser.AcclimatiserManager;
|
||||
import binnie.genetics.machine.sequencer.Sequencer;
|
||||
import binnie.genetics.proxy.Proxy;
|
||||
|
||||
@Mod(
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package binnie.genetics.machine.acclimatiser;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
@@ -7,7 +9,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
import binnie.genetics.api.acclimatiser.IToleranceType;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -24,6 +25,7 @@ import forestry.api.lepidopterology.EnumButterflyChromosome;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.genetics.Tolerance;
|
||||
import binnie.core.liquid.FluidContainerType;
|
||||
import binnie.genetics.api.acclimatiser.IToleranceType;
|
||||
|
||||
public class Acclimatiser {
|
||||
public static final int[] SLOT_RESERVE = new int[]{0, 1, 2, 3};
|
||||
@@ -49,6 +51,8 @@ public class Acclimatiser {
|
||||
}
|
||||
|
||||
public static void addTolerance(IChromosomeType chromosome, IToleranceType type) {
|
||||
Preconditions.checkNotNull(chromosome, "chromosome must not be null");
|
||||
Preconditions.checkNotNull(type, "type must not be null");
|
||||
Acclimatiser.toleranceSystems.add(new ToleranceSystem(chromosome, type));
|
||||
Acclimatiser.toleranceTypes.add(type);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user