Moved punnett square and apiarist database to the genetics mod

This commit is contained in:
Elec332 committed 2017-05-13 18:42:38 +02:00
1 parent 34a9a90ab3
commit b7da877963
33 files changed
+250 -177

No files matched your search

@@ -4,7 +4,7 @@ import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.resource.minecraft.PaddedTexture;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.extrabees.client.ExtraBeeTexture;
import binnie.extrabees.client.gui.punnett.ExtraBeeGUITexture;
import binnie.genetics.gui.punnett.ExtraBeeGUITexture;
public class StyleSheetPunnett extends StyleSheet {
public StyleSheetPunnett() {
@@ -31,7 +31,7 @@ public class ExtraBeesIntegration implements IInitializable {
rock = getExtraBeesSpecies("rock");
basalt = getExtraBeesSpecies("basalt");
hive = Preconditions.checkNotNull(ForgeRegistries.BLOCKS.getValue(new ResourceLocation("extrabees", "hive")));
dictionary = Preconditions.checkNotNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation("extrabees", "dictionary")));
dictionary = Preconditions.checkNotNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation("genetics", "dictionary")));
}
@Override
@@ -1,15 +1,20 @@
package binnie.extrabees.alveary;
import com.google.common.collect.Lists;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.EnergyStorage;
import net.minecraftforge.energy.IEnergyStorage;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
/**
* Created by Elec332 on 13-5-2017.
*/
public class AlvearyLogicTransmitter extends AbstractAlvearyLogic {
public class AlvearyLogicTransmitter extends AbstractAlvearyLogic implements IEnergyStorage {
public AlvearyLogicTransmitter(){
internalStorage = new EnergyStorage(2000);
@@ -49,4 +54,46 @@ public class AlvearyLogicTransmitter extends AbstractAlvearyLogic {
}
}
@Override
public int receiveEnergy(int maxReceive, boolean simulate) {
return internalStorage.receiveEnergy(maxReceive, simulate);
}
@Override
public int extractEnergy(int maxExtract, boolean simulate) {
return 0;
}
@Override
public int getEnergyStored() {
return internalStorage.getEnergyStored();
}
@Override
public int getMaxEnergyStored() {
return internalStorage.getMaxEnergyStored();
}
@Override
public boolean canExtract() {
return false;
}
@Override
public boolean canReceive() {
return true;
}
@Override
public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
return capability == CapabilityEnergy.ENERGY;
}
@Nullable
@Override
@SuppressWarnings("unchecked")
public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
return capability == CapabilityEnergy.ENERGY ? (T) this : null;
}
}
@@ -6,7 +6,6 @@ import binnie.extrabees.client.gui.WindowAlvearyFrame;
import binnie.extrabees.client.gui.WindowAlvearyHatchery;
import binnie.extrabees.client.gui.WindowAlvearyMutator;
import binnie.extrabees.client.gui.WindowAlvearyStimulator;
import binnie.extrabees.client.gui.database.WindowApiaristDatabase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
@@ -17,12 +16,9 @@ import net.minecraftforge.fml.relauncher.Side;
import javax.annotation.Nullable;
public enum ExtraBeeGUID implements IBinnieGUID {
Database,
DatabaseNEI,
AlvearyMutator,
AlvearyFrame,
AlvearyStimulator,
PunnettSquare,
AlvearyHatchery;
@Override
@@ -35,11 +31,6 @@ public enum ExtraBeeGUID implements IBinnieGUID {
object = (IInventory) tileEntity;
}
switch (this) {
case Database:
case DatabaseNEI: {
window = WindowApiaristDatabase.create(player, side, this != ExtraBeeGUID.Database);
break;
}
case AlvearyMutator: {
window = WindowAlvearyMutator.create(player, object, side);
break;
@@ -214,12 +214,12 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
@Override
public String getName() {
return ExtraBees.proxy.localise("species." + this.name().toLowerCase() + ".name");
return ExtraBees.proxy.localise(getUnlocalizedName());
}
@Override
public String getDescription() {
return ExtraBees.proxy.localise("species." + this.name().toLowerCase() + ".desc");
return ExtraBees.proxy.localise(getUID() + ".desc");
}
@Override
@@ -1148,7 +1148,7 @@ public enum ExtraBeesSpecies implements IAlleleBeeSpecies {
@Override
public String getUnlocalizedName() {
return this.getUID();
return this.getUID() + ".name";
}
@Override
@@ -29,7 +29,7 @@ public final class ItemRegister {
@SuppressWarnings("all")
private static void registerMisc(){
Item i = /*GameRegistry.register(new ItemBlock(ExtraBees.alveary){
Item /*i; = GameRegistry.register(new ItemBlock(ExtraBees.alveary){
@Override
public int getMetadata(int damage) {
@@ -54,7 +54,6 @@ public final class ItemRegister {
for (int j = 0; j < EnumHiveType.values().length; j++) {
ExtraBees.proxy.registerModel(i, j);
}
ExtraBees.proxy.registerItem(ExtraBees.dictionary = new ItemDictionary());
ExtraBees.proxy.registerModel(GameRegistry.register(new ItemBlock(ExtraBees.ectoplasm).setRegistryName(ExtraBees.ectoplasm.getRegistryName())), 0);
ExtraBees.itemMisc = ExtraBees.proxy.registerItem(new ItemMiscProduct(Tabs.tabApiculture, ExtraBeeItems.values()));
for (final EnumHiveFrame frame : EnumHiveFrame.values()) {
@@ -7,12 +7,20 @@ import binnie.core.gui.IBinnieGUID;
import binnie.core.network.BinniePacketHandler;
import binnie.core.network.IPacketID;
import binnie.core.proxy.IProxyCore;
import binnie.genetics.item.ItemBeeDictionary;
import binnie.extrabees.utils.Utils;
import binnie.genetics.core.GeneticsGUI;
import binnie.genetics.core.GeneticsPacket;
import binnie.genetics.item.ItemPunnettSquare;
import binnie.genetics.item.ModuleItems;
import binnie.genetics.machine.ModuleMachine;
import binnie.genetics.proxy.Proxy;
import com.google.common.base.Preconditions;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -36,14 +44,19 @@ public class Genetics extends AbstractMod {
@Nullable
private static ModuleMachine machine;
private static Item dictionaryBees;
@Mod.EventHandler
public void preInit(final FMLPreInitializationEvent evt) {
proxy.registerItem(dictionaryBees = new ItemBeeDictionary());
proxy.registerItem(new ItemPunnettSquare());
this.preInit();
}
@Mod.EventHandler
public void init(final FMLInitializationEvent evt) {
this.init();
RecipeManagers.carpenterManager.addRecipe(100, Utils.getFluidFromName("water", 2000), ItemStack.EMPTY, new ItemStack(dictionaryBees), "X#X", "YEY", "RDR", '#', Blocks.GLASS_PANE, 'X', Items.GOLD_INGOT, 'Y', "ingotTin", 'R', Items.REDSTONE, 'D', Items.DIAMOND, 'E', Items.EMERALD);
}
@Mod.EventHandler
@@ -2,7 +2,9 @@ package binnie.genetics.core;
import binnie.core.craftgui.minecraft.Window;
import binnie.core.gui.IBinnieGUID;
import binnie.genetics.gui.bee.database.WindowApiaristDatabase;
import binnie.genetics.gui.WindowAnalyst;
import binnie.genetics.gui.punnett.WindowPunnettSquare;
import binnie.genetics.machine.acclimatiser.WindowAcclimatiser;
import binnie.genetics.machine.analyser.WindowAnalyser;
import binnie.genetics.machine.craftgui.WindowGeneBank;
@@ -38,7 +40,10 @@ public enum GeneticsGUI implements IBinnieGUID {
Splicer(WindowSplicer::new),
Analyst(WindowAnalyst.create(false, false)),
Registry(WindowAnalyst.create(true, false)),
MasterRegistry(WindowAnalyst.create(true, true));
MasterRegistry(WindowAnalyst.create(true, true)),
BeeDatabase((player, inventory, side) -> WindowApiaristDatabase.create(player, side, false)),
BeeDatabaseNEI((player, inventory, side) -> WindowApiaristDatabase.create(player, side, true)),
PunnettSquare(WindowPunnettSquare::create);
private final WindowFactory windowFactory;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.Binnie;
import binnie.core.craftgui.*;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.Binnie;
import binnie.core.craftgui.*;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.Binnie;
import binnie.core.BinnieCore;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.core.craftgui.controls.ControlText;
import binnie.core.craftgui.controls.ControlTextCentered;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlTextCentered;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.Binnie;
import binnie.core.craftgui.IWidget;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.bee.database;
import binnie.Binnie;
import binnie.core.AbstractMod;
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.extrabees.client.gui.punnett;
package binnie.genetics.gui.bee.database;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.punnett;
package binnie.genetics.gui.punnett;
import binnie.core.craftgui.*;
import binnie.core.craftgui.controls.core.Control;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.punnett;
package binnie.genetics.gui.punnett;
import binnie.core.craftgui.IWidget;
import binnie.core.craftgui.controls.ControlText;
@@ -1,4 +1,4 @@
package binnie.extrabees.client.gui.punnett;
package binnie.genetics.gui.punnett;
public enum ExtraBeeGUITexture {
Chromosome,
@@ -1,5 +1,6 @@
package binnie.extrabees.client.gui.punnett;
package binnie.genetics.gui.punnett;
import binnie.Binnie;
import binnie.core.AbstractMod;
import binnie.core.craftgui.CraftGUI;
import binnie.core.craftgui.minecraft.Window;
@@ -8,8 +9,10 @@ import binnie.core.craftgui.resource.StyleSheet;
import binnie.core.craftgui.resource.minecraft.CraftGUITexture;
import binnie.core.craftgui.resource.minecraft.PaddedTexture;
import binnie.core.craftgui.resource.minecraft.StandardTexture;
import binnie.extrabees.client.GuiHack;
import binnie.extrabees.client.ExtraBeeTexture;
import binnie.core.resource.BinnieResource;
import binnie.core.resource.IBinnieTexture;
import binnie.core.resource.ResourceType;
import binnie.genetics.Genetics;
import forestry.api.genetics.ISpeciesRoot;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@@ -19,11 +22,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nullable;
public class WindowPunnettSquare extends Window {
ControlSlot bee1;
ControlSlot bee2;
ControlPunnett punnett;
@Nullable
ISpeciesRoot root;
public static Window create(final EntityPlayer player, final IInventory inventory, final Side side) {
return new WindowPunnettSquare(player, inventory, side);
@@ -34,9 +32,16 @@ public class WindowPunnettSquare extends Window {
this.root = null;
}
private static final IBinnieTexture texture = new GuiTexture();
ControlSlot bee1;
ControlSlot bee2;
ControlPunnett punnett;
@Nullable
ISpeciesRoot root;
@Override
public AbstractMod getMod() {
return GuiHack.INSTANCE;
return Genetics.instance;
}
@Override
@@ -53,10 +58,27 @@ public class WindowPunnettSquare extends Window {
static class StyleSheetPunnett extends StyleSheet {
public StyleSheetPunnett() {
this.textures.put(CraftGUITexture.Window, new PaddedTexture(0, 0, 160, 160, 0, ExtraBeeTexture.GUIPunnett, 32, 32, 32, 32));
this.textures.put(CraftGUITexture.Slot, new StandardTexture(160, 0, 18, 18, 0, ExtraBeeTexture.GUIPunnett));
this.textures.put(ExtraBeeGUITexture.Chromosome, new StandardTexture(160, 36, 16, 16, 0, ExtraBeeTexture.GUIPunnett));
this.textures.put(ExtraBeeGUITexture.Chromosome2, new StandardTexture(160, 52, 16, 16, 0, ExtraBeeTexture.GUIPunnett));
this.textures.put(CraftGUITexture.Window, new PaddedTexture(0, 0, 160, 160, 0, texture, 32, 32, 32, 32));
this.textures.put(CraftGUITexture.Slot, new StandardTexture(160, 0, 18, 18, 0, texture));
this.textures.put(ExtraBeeGUITexture.Chromosome, new StandardTexture(160, 36, 16, 16, 0, texture));
this.textures.put(ExtraBeeGUITexture.Chromosome2, new StandardTexture(160, 52, 16, 16, 0, texture));
}
}
private static class GuiTexture implements IBinnieTexture {
@SideOnly(Side.CLIENT)
@Nullable
private BinnieResource resource;
@Override
public BinnieResource getTexture() {
if (resource == null) {
resource = Binnie.RESOURCE.getPNG("genetics", ResourceType.GUI, "punnett");
}
return resource;
}
}
}
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@FieldsAreNonnullByDefault
package binnie.extrabees.client.gui.database;
package binnie.genetics.gui.punnett;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,7 +1,8 @@
package binnie.extrabees.items;
package binnie.genetics.item;
import binnie.extrabees.client.GuiHack;
import binnie.extrabees.client.ExtraBeeGUID;
import binnie.botany.Botany;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsGUI;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.Tabs;
@@ -21,9 +22,9 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import javax.annotation.Nonnull;
import java.util.List;
public class ItemDictionary extends Item implements IItemModelRegister {
public class ItemBeeDictionary extends Item implements IItemModelRegister {
public ItemDictionary() {
public ItemBeeDictionary() {
this.setCreativeTab(Tabs.tabApiculture);
this.setUnlocalizedName("dictionary");
this.setMaxStackSize(1);
@@ -50,13 +51,13 @@ public class ItemDictionary extends Item implements IItemModelRegister {
@Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
final ItemStack itemStack = playerIn.getHeldItem(handIn);
final ExtraBeeGUID id;
final GeneticsGUI id;
if (itemStack.getItemDamage() == 0) {
id = ExtraBeeGUID.Database;
id = GeneticsGUI.BeeDatabase;
} else {
id = ExtraBeeGUID.DatabaseNEI;
id = GeneticsGUI.BeeDatabaseNEI;
}
GuiHack.INSTANCE.openGui(id, playerIn, playerIn.getPosition());
Genetics.proxy.openGui(id, playerIn, playerIn.getPosition());
return super.onItemRightClick(worldIn, playerIn, handIn);
}
@@ -71,8 +72,8 @@ public class ItemDictionary extends Item implements IItemModelRegister {
@SideOnly(Side.CLIENT)
@SuppressWarnings("all")
public void registerModel(Item item, IModelManager manager) {
ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(getRegistryName(), "inventory"));
ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(getRegistryName().toString() + "_master", "inventory"));
ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory"));
ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation(getRegistryName().toString() + "_master", "inventory"));
}
}
@@ -1,7 +1,7 @@
package binnie.extrabees.items;
package binnie.genetics.item;
import binnie.extrabees.client.GuiHack;
import binnie.extrabees.client.ExtraBeeGUID;
import binnie.genetics.Genetics;
import binnie.genetics.core.GeneticsGUI;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -16,6 +16,7 @@ public class ItemPunnettSquare extends Item {
public ItemPunnettSquare() {
this.setCreativeTab(CreativeTabs.TOOLS);
this.setMaxStackSize(1);
setRegistryName("punnett_square");
}
@Override
@@ -26,7 +27,7 @@ public class ItemPunnettSquare extends Item {
@Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand handIn) {
if (handIn == EnumHand.MAIN_HAND) {
GuiHack.INSTANCE.openGui(ExtraBeeGUID.PunnettSquare, playerIn, playerIn.getPosition());
Genetics.proxy.openGui(GeneticsGUI.PunnettSquare, playerIn, playerIn.getPosition());
}
ItemStack itemStack = playerIn.getHeldItem(handIn);
return new ActionResult<>(EnumActionResult.PASS, itemStack);