Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
Nedelosk committed 2016-10-25 18:14:30 +02:00
commit f993d0571d
40 files changed
+239 -271

No files matched your search

+14 -13
View File
@@ -52,7 +52,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = Constants.BOTANY_MOD_ID, name = "Binnie's Botany", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class Botany extends AbstractMod {
public static final float AGE_CHANCE = 0.2f;
@Mod.Instance(Constants.BOTANY_MOD_ID)
public static Botany instance;
@SidedProxy(clientSide = "binnie.botany.proxy.ProxyClient", serverSide = "binnie.botany.proxy.ProxyServer")
@@ -86,19 +86,16 @@ public class Botany extends AbstractMod {
public static BlockStained stained;
public static BlockCeramicBrick ceramicBrick;
public static final float AGE_CHANCE = 0.2f;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.addModule(new ModuleCore());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleGardening());
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
@@ -106,8 +103,11 @@ public class Botany extends AbstractMod {
this.postInit();
}
public Botany() {
Botany.instance = this;
@Override
protected void registerModules() {
this.addModule(new ModuleCore());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleGardening());
}
@Override
@@ -145,6 +145,11 @@ public class Botany extends AbstractMod {
return PacketHandler.class;
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@SubscribeEvent
public void onShearFlower(final PlayerInteractEvent.RightClickBlock event) {
if (event.getEntityPlayer() != null && event.getEntityPlayer().getHeldItemMainhand() != null && event.getEntityPlayer().getHeldItemMainhand().getItem() == Items.SHEARS) {
@@ -271,11 +276,6 @@ public class Botany extends AbstractMod {
}
}
@Override
public boolean isActive() {
return BinnieCore.isBotanyActive();
}
@Mod.EventHandler
public void onIMC(final FMLInterModComms.IMCEvent event) {
for (final FMLInterModComms.IMCMessage message : event.getMessages()) {
@@ -305,4 +305,5 @@ public class Botany extends AbstractMod {
super(Botany.instance);
}
}
}
@@ -1,11 +1,11 @@
package binnie.botany.api;
import java.util.Locale;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.util.text.translation.I18n;
import java.util.Locale;
public enum EnumSoilType implements IStringSerializable {
SOIL(TextFormatting.DARK_GRAY),
LOAM(TextFormatting.GOLD),
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IAlleleFlowerSpecies> {
IFlowerType getType();
EnumAcidity getPH();
@@ -20,8 +21,8 @@ public interface IAlleleFlowerSpecies extends IAlleleSpecies, IAlleleProperty<IA
@SideOnly(Side.CLIENT)
int getFlowerColour(EnumFlowerStage type, int renderPass);
@SideOnly(Side.CLIENT)
@Nonnull
@SideOnly(Side.CLIENT)
ModelResourceLocation getFlowerModel(EnumFlowerStage type, boolean flowered, int section);
@SideOnly(Side.CLIENT)
@@ -1,10 +1,10 @@
package binnie.botany.api;
import javax.annotation.Nonnull;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
import javax.annotation.Nonnull;
public interface IFlowerFactory {
@Nonnull
@@ -3,9 +3,9 @@ package binnie.botany.ceramic;
import binnie.Constants;
import binnie.botany.Botany;
import binnie.botany.CreativeTabBotany;
import binnie.botany.ceramic.BlockCeramicBrick.BlockType;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
import binnie.botany.ceramic.BlockCeramicBrick.BlockType;
import binnie.core.block.BlockMetadata;
import binnie.core.block.IBlockMetadata;
import binnie.core.block.IMultipassBlock;
@@ -1,8 +1,5 @@
package binnie.botany.ceramic;
import java.util.HashMap;
import java.util.Map;
import binnie.botany.Botany;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.botany.items.BotanyItems;
@@ -18,6 +15,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
public class CeramicDesignSystem implements IDesignSystem {
public static CeramicDesignSystem instance = new CeramicDesignSystem();
Map<Integer, TextureAtlasSprite> primary;
@@ -10,8 +10,6 @@ import binnie.botany.api.IFlower;
import binnie.botany.api.IFlowerType;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.Flower;
import binnie.botany.genetics.FlowerDefinition;
import binnie.botany.genetics.FlowerGenome;
import binnie.core.BinnieCore;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
@@ -163,9 +161,6 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
return null;
}
IAlleleFlowerSpecies flowerSpecies = flower.getGenome().getPrimary();
if (flowerSpecies == null) {
flowerSpecies = FlowerDefinition.Dandelion.getSpecies();
}
IFlowerType flowerType = flowerSpecies.getType();
return flowerSpecies.getFlowerModel(type, flower.hasFlowered(), flowerType.getSections() - 1);
}
@@ -16,11 +16,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.*;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
@@ -1,14 +1,6 @@
package binnie.botany.genetics;
import javax.annotation.Nonnull;
import binnie.botany.api.EnumAcidity;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.EnumMoisture;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IAlleleFlowerSpeciesBuilder;
import binnie.botany.api.IFlowerType;
import binnie.botany.api.*;
import binnie.botany.core.BotanyCore;
import forestry.api.core.IModelManager;
import forestry.api.genetics.AlleleManager;
@@ -18,6 +10,8 @@ import forestry.core.genetics.alleles.AlleleSpecies;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
import javax.annotation.Nonnull;
public class AlleleFlowerSpecies extends AlleleSpecies implements IAlleleFlowerSpecies, IAlleleFlowerSpeciesBuilder {
@Nonnull
@@ -11,11 +11,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Random;
import javax.annotation.Nonnull;
public class Flower extends Individual implements IFlower {
public IFlowerGenome genome;
public IFlowerGenome mate;
@@ -1046,7 +1046,6 @@ public enum FlowerDefinition implements IFlowerDefinition {
IFlower flower = getIndividual();
return BotanyCore.getFlowerRoot().getMemberStack(flower, flowerStage);
}
public static void preInitFlowers(){
MinecraftForge.EVENT_BUS.post(new AlleleSpeciesRegisterEvent(FlowerManager.flowerRoot));
@@ -1,10 +1,6 @@
package binnie.botany.genetics;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IAlleleFlowerSpeciesBuilder;
import binnie.botany.api.IFlowerFactory;
import binnie.botany.api.IFlowerMutationBuilder;
import binnie.botany.api.IFlowerType;
import binnie.botany.api.*;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
@@ -1,10 +1,6 @@
package binnie.botany.genetics;
import binnie.botany.api.IAlleleFlowerSpecies;
import binnie.botany.api.IFlowerGenome;
import binnie.botany.api.IFlowerMutation;
import binnie.botany.api.IFlowerMutationBuilder;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.api.*;
import binnie.botany.core.BotanyCore;
import forestry.api.core.ForestryAPI;
import forestry.api.genetics.IAllele;
@@ -3,7 +3,6 @@ package binnie.botany.genetics;
import binnie.botany.Botany;
import binnie.botany.api.*;
import com.mojang.authlib.GameProfile;
import forestry.api.genetics.*;
import forestry.core.genetics.SpeciesRoot;
import net.minecraft.item.Item;
@@ -31,6 +31,8 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
MinecraftForge.EVENT_BUS.register(this);
}
protected abstract void registerModules();
public abstract boolean isActive();
@Override
@@ -64,6 +66,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
if (!this.isActive()) {
return;
}
registerModules();
if (this.getConfigs() != null) {
for (final Class cls : this.getConfigs()) {
Binnie.Configuration.registerConfiguration(cls, this);
@@ -87,6 +90,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
throw new RuntimeException(e);
}
}
getProxy().registerModels();
}
@Override
@@ -107,6 +111,7 @@ public abstract class AbstractMod implements IPacketProvider, IInitializable {
throw new RuntimeException(e);
}
}
getProxy().registerItemAndBlockColors();
}
@Override
+91 -101
View File
@@ -48,6 +48,7 @@ import java.util.List;
@Mod(modid = Constants.CORE_MOD_ID, name = "Binnie Core", useMetadata = true, dependencies = "required-after:forestry")
public final class BinnieCore extends AbstractMod {
@Mod.Instance(Constants.CORE_MOD_ID)
public static BinnieCore instance;
@SidedProxy(clientSide = "binnie.core.proxy.BinnieProxyClient", serverSide = "binnie.core.proxy.BinnieProxyServer")
@@ -61,6 +62,34 @@ public final class BinnieCore extends AbstractMod {
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
Binnie.Configuration.registerConfiguration(ConfigurationMods.class, this);
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
BinnieCore.proxy.registerItem(item);
}
//TODO REMOVE ITEMPARSER
FieldParser.parsers.add(new ItemParser());
this.preInit();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
for (final AbstractMod mod : getActiveMods()) {
NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
}
//TODO RENDERING
// BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
// RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
}
@Mod.EventHandler
public void postInit(final FMLPostInitializationEvent evt) {
this.postInit();
}
@Override
protected void registerModules() {
for (final ManagerBase baseManager : Binnie.Managers) {
this.addModule(baseManager);
}
@@ -70,19 +99,6 @@ public final class BinnieCore extends AbstractMod {
if (Loader.isModLoaded("BuildCraft|Silicon")) {
this.addModule(new ModuleTrigger());
}
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
public void postInit(final FMLPostInitializationEvent evt) {
this.postInit();
}
@Override
@@ -91,29 +107,73 @@ public final class BinnieCore extends AbstractMod {
}
@Override
public void preInit() {
BinnieCore.instance = this;
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
BinnieCore.proxy.registerItem(item);
}
//TODO REMMOVE ITEMPARSER
FieldParser.parsers.add(new ItemParser());
super.preInit();
public String getChannel() {
return "BIN";
}
@Override
public void init() {
super.init();
for (final AbstractMod mod : getActiveMods()) {
NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
}
//TODO RENDERING
// BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
// RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
public IBinnieProxy getProxy() {
return BinnieCore.proxy;
}
@Override
public String getModID() {
return "binniecore";
}
@Override
public IPacketID[] getPacketIDs() {
return BinnieCorePacketID.values();
}
@Override
public Class<?>[] getConfigs() {
return new Class[]{ConfigurationMain.class};
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class;
}
@Override
public boolean isActive() {
return true;
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) {
try {
final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
final NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
} catch (Exception ex) {
}
}
//TODO RENDERING
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(final TextureStitchEvent.Pre event) {
// if (event.map.getTextureType() == 0) {
// Binnie.Liquid.reloadIcons(event.map);
// }
Binnie.Resource.registerIcons();
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(BinnieCore.instance);
}
}
//Module handling
public static boolean isLepidopteryActive() {
return PluginManager.configDisabledPlugins.stream().noneMatch(e -> e instanceof forestry.lepidopterology.PluginLepidopterology);
}
@@ -142,11 +202,6 @@ public final class BinnieCore extends AbstractMod {
return ConfigurationMods.extraTrees && isArboricultureActive();
}
@Override
public void postInit() {
super.postInit();
}
static void registerMod(final AbstractMod mod) {
BinnieCore.modList.add(mod);
}
@@ -161,69 +216,4 @@ public final class BinnieCore extends AbstractMod {
return list;
}
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleSpeciesDiscovered(final ForestryEvent.SpeciesDiscovered event) {
try {
final EntityPlayerMP player = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(event.username.getId());
if (player == null) {
return;
}
event.tracker.synchToPlayer(player);
final NBTTagCompound nbt = new NBTTagCompound();
nbt.setString("species", event.species.getUID());
} catch (Exception ex) {
}
}
@Override
public String getChannel() {
return "BIN";
}
@Override
public IBinnieProxy getProxy() {
return BinnieCore.proxy;
}
@Override
public String getModID() {
return "binniecore";
}
@Override
public IPacketID[] getPacketIDs() {
return BinnieCorePacketID.values();
}
//TODO RENDERING
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void handleTextureRemap(final TextureStitchEvent.Pre event) {
// if (event.map.getTextureType() == 0) {
// Binnie.Liquid.reloadIcons(event.map);
// }
Binnie.Resource.registerIcons();
}
@Override
public Class<?>[] getConfigs() {
return new Class[]{ConfigurationMain.class};
}
@Override
protected Class<? extends BinniePacketHandler> getPacketHandler() {
return PacketHandler.class;
}
@Override
public boolean isActive() {
return true;
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(BinnieCore.instance);
}
}
}
@@ -1,7 +1,5 @@
package binnie.core.block;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
@@ -13,6 +11,8 @@ import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemMetadata extends ItemBlock {
public ItemMetadata(final Block block) {
super(block);
@@ -1,7 +1,10 @@
package binnie.core.genetics;
import binnie.Binnie;
import binnie.botany.api.*;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.botany.api.EnumFlowerStage;
import binnie.botany.api.IBotanistTracker;
import binnie.botany.api.IFlowerRoot;
import binnie.botany.core.BotanyCore;
import binnie.botany.genetics.EnumFlowerColor;
import binnie.core.BinnieCore;
+1 -2
View File
@@ -1,5 +1,6 @@
package binnie.core.item;
import forestry.api.core.IModelManager;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -10,8 +11,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
import java.util.Locale;
import forestry.api.core.IModelManager;
public class ItemMisc extends ItemCore {
private IItemMisc[] items;
@@ -7,11 +7,7 @@ import binnie.core.machines.inventory.ValidatorIcon;
import forestry.api.core.INbtReadable;
import forestry.api.core.INbtWritable;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
public class ManagerMachine extends ManagerBase {
private Map<Class<?>, Class<?>[]> componentInterfaceMap;
@@ -1,12 +1,13 @@
package binnie.core.models;
import com.google.common.collect.ImmutableMap;
import javax.annotation.Nonnull;
import javax.vecmath.Vector3f;
import java.util.ArrayList;
import java.util.List;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.core.blocks.IColoredBlock;
import forestry.core.items.IColoredItem;
import forestry.core.models.BlockModelEntry;
import forestry.core.models.ModelEntry;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
@@ -23,7 +24,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.registry.IRegistry;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.SimpleModelState;
@@ -32,13 +32,10 @@ import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.core.blocks.IColoredBlock;
import forestry.core.items.IColoredItem;
import forestry.core.models.BlockModelEntry;
import forestry.core.models.ModelEntry;
import javax.annotation.Nonnull;
import javax.vecmath.Vector3f;
import java.util.ArrayList;
import java.util.List;
@SideOnly(Side.CLIENT)
public class ModelManager implements IModelManager {
@@ -9,4 +9,9 @@ public interface IProxyCore extends IInitializable {
Item registerItem(Item item);
Block registerBlock(Block block);
public void registerModels();
public void registerItemAndBlockColors();
}
+3 -3
View File
@@ -1,8 +1,5 @@
package binnie.core.util;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -10,6 +7,9 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class TileUtil {
@Nullable
public static <T extends TileEntity> T getTile(@Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull Class<T> tileClass) {
@@ -20,11 +20,7 @@ import binnie.extratrees.machines.Designer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
public class ControlTileSelect extends Control implements IControlValue<IDesign>, IControlScrollable {
IDesign value;
@@ -22,6 +22,7 @@ import forestry.api.genetics.IAllele;
import forestry.api.genetics.IAlleleSpecies;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import java.util.ArrayList;
import java.util.List;
+10 -10
View File
@@ -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,
+33 -37
View File
@@ -42,11 +42,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = Constants.EXTRA_TREES_MOD_ID, name = "Binnie's Extra Trees", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class ExtraTrees extends AbstractMod {
@Mod.Instance(Constants.EXTRA_TREES_MOD_ID)
public static ExtraTrees instance;
public static final String MOD_ID = "extratrees";
@SidedProxy(clientSide = "binnie.extratrees.proxy.ProxyClient", serverSide = "binnie.extratrees.proxy.ProxyServer")
public static Proxy proxy;
public static Item itemDictionary;
@@ -80,46 +78,18 @@ public class ExtraTrees extends AbstractMod {
public static int stairsID;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.addModule(new ModuleBlocks());
this.addModule(new ModuleItems());
this.addModule(new ModuleAlcohol());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleCarpentry());
this.addModule(new ModuleMachine());
this.addModule(new ModuleCore());
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void pre(FMLConstructionEvent e) {
public void onConstruction(FMLConstructionEvent e) {
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent
public void speciesRegister(AlleleSpeciesRegisterEvent event) {
if (event.getRoot() instanceof ITreeRoot) {
for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) {
AlleleManager.alleleRegistry.registerAllele(fruit);
}
for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species, EnumTreeChromosome.SPECIES);
}
}
if (BinnieCore.isLepidopteryActive()) {
for (final ButterflySpecies species2 : ButterflySpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species2);
}
}
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.preInit();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
@@ -127,8 +97,15 @@ public class ExtraTrees extends AbstractMod {
this.postInit();
}
public ExtraTrees() {
ExtraTrees.instance = this;
@Override
protected void registerModules() {
this.addModule(new ModuleBlocks());
this.addModule(new ModuleItems());
this.addModule(new ModuleAlcohol());
this.addModule(new ModuleGenetics());
this.addModule(new ModuleCarpentry());
this.addModule(new ModuleMachine());
this.addModule(new ModuleCore());
}
@Override
@@ -166,9 +143,28 @@ public class ExtraTrees extends AbstractMod {
return BinnieCore.isExtraTreesActive();
}
@SubscribeEvent
public void speciesRegister(AlleleSpeciesRegisterEvent event) {
if (event.getRoot() instanceof ITreeRoot) {
for (final ExtraTreeFruitGene fruit : ExtraTreeFruitGene.values()) {
AlleleManager.alleleRegistry.registerAllele(fruit);
}
for (final ExtraTreeSpecies species : ExtraTreeSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species, EnumTreeChromosome.SPECIES);
}
}
if (BinnieCore.isLepidopteryActive()) {
for (final ButterflySpecies species2 : ButterflySpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species2);
}
}
}
public static class PacketHandler extends BinniePacketHandler {
public PacketHandler() {
super(ExtraBees.instance);
}
}
}
@@ -1,8 +1,5 @@
package binnie.extratrees.carpentry;
import java.util.HashMap;
import java.util.Map;
import binnie.core.AbstractMod;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.api.CarpentryManager;
@@ -16,6 +13,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import java.util.HashMap;
import java.util.Map;
public enum DesignSystem implements IDesignSystem {
Wood,
Glass;
@@ -126,7 +126,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
@Override
public int getSpriteColour(int renderPass) {
return (renderPass > 0) ? 16777215 : this.colour;
return (renderPass == 0) ? 0xFFFFFF : this.colour;
}
@Override
@@ -1,6 +1,7 @@
package binnie.extratrees.genetics;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.Mods;
import binnie.core.genetics.ForestryAllele;
import binnie.extratrees.ExtraTrees;
@@ -1063,11 +1064,11 @@ public class ExtraTreeSpecies implements IAlleleTreeSpecies//, IIconProvider, IG
Shrub;
public ModelResourceLocation getModelLocation(ExtraTreeSpecies species) {
return new ModelResourceLocation(ExtraTrees.MOD_ID + ":saplings/tree" + name());
return new ModelResourceLocation(Constants.EXTRA_TREES_MOD_ID + ":saplings/tree" + name());
}
public ResourceLocation getResourceLocation(ExtraTreeSpecies species) {
return new ResourceLocation(ExtraTrees.MOD_ID + ":saplings/tree" + name());
return new ResourceLocation(Constants.EXTRA_TREES_MOD_ID + ":saplings/tree" + name());
}
//IIcon[] icon;
}
@@ -1,6 +1,6 @@
package binnie.extratrees.genetics;
import binnie.extratrees.ExtraTrees;
import binnie.Constants;
import binnie.extratrees.block.EnumExtraTreeLog;
import forestry.api.arboriculture.*;
import forestry.api.core.ITextureManager;
@@ -23,7 +23,7 @@ public class WoodProvider implements IWoodProvider {
public WoodProvider(IWoodType type) {
this.type = type;
if (type instanceof EnumExtraTreeLog) {
modID = ExtraTrees.MOD_ID;
modID = Constants.EXTRA_TREES_MOD_ID;
} else if (type instanceof EnumVanillaWoodType) {
modID = "minecraft";
} else if (type instanceof EnumForestryWoodType) {
@@ -2,7 +2,6 @@ package binnie.extratrees.proxy;
import binnie.Constants;
import binnie.core.models.ModelManager;
import binnie.extratrees.ExtraTrees;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
@@ -29,7 +28,7 @@ public class ProxyClient extends Proxy implements IExtraTreeProxy {
ResourceLocation rl;
public CustomMapper(String name) {
rl = new ResourceLocation(ExtraTrees.MOD_ID, name);
rl = new ResourceLocation(Constants.EXTRA_TREES_MOD_ID, name);
}
@Override
+7 -7
View File
@@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
public class Genetics extends AbstractMod {
public static ItemSerumArray itemSerumArray = null;
@Mod.Instance(Constants.GENETICS_MOD_ID)
public static Genetics instance;
@SidedProxy(clientSide = "binnie.genetics.proxy.ProxyClient", serverSide = "binnie.genetics.proxy.ProxyServer")
@@ -41,19 +41,16 @@ public class Genetics extends AbstractMod {
public static ItemAnalyst analyst;
public static Item registry;
public static Item masterRegistry;
public static ItemSerumArray itemSerumArray = null;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
this.addModule(new ModuleItem());
this.addModule(new ModuleMachine());
this.preInit();
proxy.registerModels();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
proxy.registerItemAndBlockColors();
}
@Mod.EventHandler
@@ -61,8 +58,10 @@ public class Genetics extends AbstractMod {
this.postInit();
}
public Genetics() {
Genetics.instance = this;
@Override
protected void registerModules() {
this.addModule(new ModuleItem());
this.addModule(new ModuleMachine());
}
@Override
@@ -105,4 +104,5 @@ public class Genetics extends AbstractMod {
super(Genetics.instance);
}
}
}
@@ -3,11 +3,7 @@ package binnie.genetics.integration.jei;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.*;
@JEIPlugin
public class GeneticsJeiPlugin extends BlankModPlugin {
@@ -1,21 +1,21 @@
package binnie.genetics.integration.jei.incubator;
import javax.annotation.Nonnull;
import binnie.genetics.integration.jei.GeneticsJeiPlugin;
import binnie.genetics.integration.jei.RecipeUids;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IDrawableAnimated;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.IDrawableAnimated.StartDirection;
import mezz.jei.api.gui.IDrawableStatic;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import javax.annotation.Nonnull;
public class IncubatorRecipeCategory extends BlankRecipeCategory {
@Nonnull
@@ -14,6 +14,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.List;
public class ItemSerumArray extends ItemGene implements IItemSerum {