mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 04:10:07 +00:00
Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2
This commit is contained in:
commit
f993d0571d
40 files changed
+239
-271
No files matched your search
@@ -26,6 +26,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
@Mod(modid = Constants.EXTRA_BEES_MOD_ID, name = "Binnie's Extra Bees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
|
||||
public class ExtraBees extends AbstractMod {
|
||||
|
||||
@Mod.Instance(Constants.EXTRA_BEES_MOD_ID)
|
||||
public static ExtraBees instance;
|
||||
@SidedProxy(clientSide = "binnie.extrabees.proxy.ExtraBeesProxyClient", serverSide = "binnie.extrabees.proxy.ExtraBeesProxyServer")
|
||||
@@ -46,20 +47,12 @@ public class ExtraBees extends AbstractMod {
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(final FMLPreInitializationEvent evt) {
|
||||
this.addModule(new ModuleCore());
|
||||
this.addModule(new ModuleProducts());
|
||||
this.addModule(new ModuleGenetics());
|
||||
//this.addModule(new ModuleGeneration());
|
||||
this.addModule(new ModuleLiquids());
|
||||
this.addModule(new ModuleApiary());
|
||||
this.preInit();
|
||||
proxy.registerModels();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void init(final FMLInitializationEvent evt) {
|
||||
this.init();
|
||||
proxy.registerItemAndBlockColors();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
@@ -67,8 +60,14 @@ public class ExtraBees extends AbstractMod {
|
||||
this.postInit();
|
||||
}
|
||||
|
||||
public ExtraBees() {
|
||||
ExtraBees.instance = this;
|
||||
@Override
|
||||
protected void registerModules() {
|
||||
this.addModule(new ModuleCore());
|
||||
this.addModule(new ModuleProducts());
|
||||
this.addModule(new ModuleGenetics());
|
||||
//this.addModule(new ModuleGeneration());
|
||||
this.addModule(new ModuleLiquids());
|
||||
this.addModule(new ModuleApiary());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -111,4 +110,5 @@ public class ExtraBees extends AbstractMod {
|
||||
super(ExtraBees.instance);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,7 +10,10 @@ import binnie.extrabees.apiary.ComponentExtraBeeGUI;
|
||||
import binnie.extrabees.apiary.TileExtraBeeAlveary;
|
||||
import binnie.extrabees.core.ExtraBeeGUID;
|
||||
import binnie.extrabees.core.ExtraBeeTexture;
|
||||
import forestry.api.apiculture.*;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeListener;
|
||||
import forestry.api.apiculture.IBeeModifier;
|
||||
import forestry.api.apiculture.IHiveFrame;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
|
||||
@@ -1,19 +1,10 @@
|
||||
package binnie.extrabees.genetics.effect;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.util.TileUtil;
|
||||
import binnie.extrabees.ExtraBees;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeEffect;
|
||||
import forestry.api.apiculture.IArmorApiarist;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.*;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IEffectData;
|
||||
import forestry.core.proxy.Proxies;
|
||||
@@ -43,6 +34,11 @@ import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
|
||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
ECTOPLASM,
|
||||
ACID,
|
||||
|
||||
Reference in new issue
Block a user