diff --git a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java index bc17ad71..c560dd68 100644 --- a/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java +++ b/src/main/java/binnie/core/craftgui/resource/StyleSheetPunnett.java @@ -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() { diff --git a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java index 7df2fb96..676b5546 100644 --- a/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java +++ b/src/main/java/binnie/core/integration/extrabees/ExtraBeesIntegration.java @@ -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 diff --git a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java index 66f3adb9..22907051 100644 --- a/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java +++ b/src/main/java/binnie/extrabees/alveary/AlvearyLogicTransmitter.java @@ -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 getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { + return capability == CapabilityEnergy.ENERGY ? (T) this : null; + } + } diff --git a/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java b/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java index 883f554e..5385075d 100644 --- a/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java +++ b/src/main/java/binnie/extrabees/client/ExtraBeeGUID.java @@ -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; diff --git a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java index ce0e769a..5fefb658 100644 --- a/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java +++ b/src/main/java/binnie/extrabees/genetics/ExtraBeesSpecies.java @@ -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 diff --git a/src/main/java/binnie/extrabees/init/ItemRegister.java b/src/main/java/binnie/extrabees/init/ItemRegister.java index 00d709b7..519d33e3 100644 --- a/src/main/java/binnie/extrabees/init/ItemRegister.java +++ b/src/main/java/binnie/extrabees/init/ItemRegister.java @@ -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()) { diff --git a/src/main/java/binnie/genetics/Genetics.java b/src/main/java/binnie/genetics/Genetics.java index 34dcf5d9..26e0d555 100644 --- a/src/main/java/binnie/genetics/Genetics.java +++ b/src/main/java/binnie/genetics/Genetics.java @@ -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 diff --git a/src/main/java/binnie/genetics/core/GeneticsGUI.java b/src/main/java/binnie/genetics/core/GeneticsGUI.java index 89f5d582..2a6a6584 100644 --- a/src/main/java/binnie/genetics/core/GeneticsGUI.java +++ b/src/main/java/binnie/genetics/core/GeneticsGUI.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java similarity index 97% rename from src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java rename to src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java index ed24cd94..41748b9d 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/ControlBiomes.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlBiomes.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.database; +package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.craftgui.*; diff --git a/src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java similarity index 98% rename from src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java rename to src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java index 9f496685..5f3403b4 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/ControlClimateBar.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlClimateBar.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.database; +package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.craftgui.*; diff --git a/src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java similarity index 97% rename from src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java rename to src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java index 9d104fa4..16c5bac1 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/ControlProductsBox.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsBox.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.database; +package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.BinnieCore; diff --git a/src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java similarity index 96% rename from src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java rename to src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java index 8f466f29..e8a8a072 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/ControlProductsItem.java +++ b/src/main/java/binnie/genetics/gui/bee/database/ControlProductsItem.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java similarity index 95% rename from src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java rename to src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java index 42d973ae..21254e59 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesClimate.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesClimate.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java similarity index 99% rename from src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java rename to src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java index cab9b992..e2af6099 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesGenome.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesGenome.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.database; +package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.craftgui.IWidget; diff --git a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java similarity index 96% rename from src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java rename to src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java index 94825728..aa7baeda 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/PageSpeciesProducts.java +++ b/src/main/java/binnie/genetics/gui/bee/database/PageSpeciesProducts.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java similarity index 98% rename from src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java rename to src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java index 551de4de..b9c55f58 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/WindowApiaristDatabase.java +++ b/src/main/java/binnie/genetics/gui/bee/database/WindowApiaristDatabase.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.database; +package binnie.genetics.gui.bee.database; import binnie.Binnie; import binnie.core.AbstractMod; diff --git a/src/main/java/binnie/extrabees/client/gui/punnett/package-info.java b/src/main/java/binnie/genetics/gui/bee/database/package-info.java similarity index 84% rename from src/main/java/binnie/extrabees/client/gui/punnett/package-info.java rename to src/main/java/binnie/genetics/gui/bee/database/package-info.java index a6ddb972..1d132f39 100644 --- a/src/main/java/binnie/extrabees/client/gui/punnett/package-info.java +++ b/src/main/java/binnie/genetics/gui/bee/database/package-info.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java similarity index 96% rename from src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java rename to src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java index 0a286a89..17440def 100644 --- a/src/main/java/binnie/extrabees/client/gui/punnett/ControlChromosome.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlChromosome.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java similarity index 98% rename from src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java rename to src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java index e1cb8f32..50e15afe 100644 --- a/src/main/java/binnie/extrabees/client/gui/punnett/ControlPunnett.java +++ b/src/main/java/binnie/genetics/gui/punnett/ControlPunnett.java @@ -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; diff --git a/src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java b/src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java similarity index 58% rename from src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java rename to src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java index ccbe8af8..6658c53b 100644 --- a/src/main/java/binnie/extrabees/client/gui/punnett/ExtraBeeGUITexture.java +++ b/src/main/java/binnie/genetics/gui/punnett/ExtraBeeGUITexture.java @@ -1,4 +1,4 @@ -package binnie.extrabees.client.gui.punnett; +package binnie.genetics.gui.punnett; public enum ExtraBeeGUITexture { Chromosome, diff --git a/src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java similarity index 69% rename from src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java rename to src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java index b54f111e..88935542 100644 --- a/src/main/java/binnie/extrabees/client/gui/punnett/WindowPunnettSquare.java +++ b/src/main/java/binnie/genetics/gui/punnett/WindowPunnettSquare.java @@ -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; + } + + } + } diff --git a/src/main/java/binnie/extrabees/client/gui/database/package-info.java b/src/main/java/binnie/genetics/gui/punnett/package-info.java similarity index 83% rename from src/main/java/binnie/extrabees/client/gui/database/package-info.java rename to src/main/java/binnie/genetics/gui/punnett/package-info.java index 183d6c4a..37854217 100644 --- a/src/main/java/binnie/extrabees/client/gui/database/package-info.java +++ b/src/main/java/binnie/genetics/gui/punnett/package-info.java @@ -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; diff --git a/src/main/java/binnie/extrabees/items/ItemDictionary.java b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java similarity index 80% rename from src/main/java/binnie/extrabees/items/ItemDictionary.java rename to src/main/java/binnie/genetics/item/ItemBeeDictionary.java index 52bdad98..b3b9196a 100644 --- a/src/main/java/binnie/extrabees/items/ItemDictionary.java +++ b/src/main/java/binnie/genetics/item/ItemBeeDictionary.java @@ -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 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")); } } diff --git a/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java similarity index 79% rename from src/main/java/binnie/extrabees/items/ItemPunnettSquare.java rename to src/main/java/binnie/genetics/item/ItemPunnettSquare.java index 3d45dd93..a5fe3843 100644 --- a/src/main/java/binnie/extrabees/items/ItemPunnettSquare.java +++ b/src/main/java/binnie/genetics/item/ItemPunnettSquare.java @@ -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 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); diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index a13c742b..75ce7ecb 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -119,24 +119,6 @@ extrabees.item.frame.soul=Soul Frame extrabees.item.frame.clay=Healing Frame extrabees.item.frame.debug=Nova Frame -extrabees.item.serum.tooltip.nocharge=Empty -extrabees.item.serum.tooltip.charge1=1 Charge -extrabees.item.serum.tooltip.manycharge=%d Charges -extrabees.item.serum.corrupted=Corrupted Serum -extrabees.item.serum.name=%s Serum -extrabees.item.serum.empty=Empty Serum - -extrabees.item.template.corrupted=Corrupted Template -extrabees.item.template.name=%s Template -extrabees.item.template.empty=Blank Template - - - - -extrabees.block.apiaristMachine.name=Apiarist Machine -extrabees.block.geneticMachine.name=Genetic Machine -extrabees.block.advGeneticMachine.name=Advanced Genetic Machine - extrabees.block.ectoplasm.name=Ectoplasm extrabees.block.hive.0=Water Hive @@ -151,9 +133,6 @@ extrabees.block.hive.3=Marble Hive extrabees.liquid.acid=Acid extrabees.liquid.poison=Poison extrabees.liquid.glacial=Liquid Nitrogen -extrabees.liquid.dna=Liquid DNA - - ################################################## @@ -193,82 +172,6 @@ for.binnie.circuit.stimulator.mutation=Mutagenic Stimulus for.binnie.circuit.stimulator.inhibitor=Inhibiting Stimulus for.binnie.circuit.stimulator.territory=Agitating Stimulus -extrabees.genetics.quality.awful=Awful -extrabees.genetics.quality.poor=Poor -extrabees.genetics.quality.average=Average -extrabees.genetics.quality.good=Good -extrabees.genetics.quality.excellent=Excellent - -extrabees.genetics.quality.tooltip=%s Quality - -extrabees.genetics.allele.shortest=Shortest -extrabees.genetics.allele.shorter=Shorter -extrabees.genetics.allele.short=Short -extrabees.genetics.allele.shortened=Shortened -extrabees.genetics.allele.normal=Normal -extrabees.genetics.allele.elongated=Elongated -extrabees.genetics.allele.long=Long -extrabees.genetics.allele.longer=Longer -extrabees.genetics.allele.longest=Longest - -extrabees.genetics.allele.slowest=Slowest -extrabees.genetics.allele.slower=Slower -extrabees.genetics.allele.slow=Slow -extrabees.genetics.allele.norm=Normal -extrabees.genetics.allele.fast=Fast -extrabees.genetics.allele.faster=Faster -extrabees.genetics.allele.fastest=Fastest - -extrabees.genetics.allele.low=Low -extrabees.genetics.allele.high=High -extrabees.genetics.allele.maximum=Maximum - -extrabees.genetics.allele.average=Average - -extrabees.genetics.allele.default=Default -extrabees.genetics.allele.large=Large -extrabees.genetics.allele.larger=Larger -extrabees.genetics.allele.largest=Largest - -extrabees.genetics.allele.none=None -extrabees.genetics.allele.both1=Both 1 -extrabees.genetics.allele.both2=Both 2 -extrabees.genetics.allele.both3=Both 3 -extrabees.genetics.allele.both4=Both 4 -extrabees.genetics.allele.both5=Both 5 -extrabees.genetics.allele.up1=Up 1 -extrabees.genetics.allele.up2=Up 2 -extrabees.genetics.allele.up3=Up 3 -extrabees.genetics.allele.up4=Up 4 -extrabees.genetics.allele.up5=Up 5 -extrabees.genetics.allele.down1=Down 1 -extrabees.genetics.allele.down2=Down 2 -extrabees.genetics.allele.down3=Down 3 -extrabees.genetics.allele.down4=Down 4 -extrabees.genetics.allele.down5=Down 5 - -extrabees.genetics.allele.noeffect=Effect Cancellation -extrabees.genetics.allele.noflower=Non-pollination - -extrabees.genetics.allele.lifespan=%s Lifespan -extrabees.genetics.allele.production=%s Production -extrabees.genetics.allele.fertility=%s Fertility -extrabees.genetics.allele.flowering=%s Flowering -extrabees.genetics.allele.territory=%s Territory -extrabees.genetics.allele.tolerance=%s %s Tol. -extrabees.genetics.allele.species=%s Species -extrabees.genetics.allele.effect=%s Effect -extrabees.genetics.allele.flower=%s Pollination -extrabees.genetics.allele.humidity=Humid. -extrabees.genetics.allele.temperature=Temp. -extrabees.genetics.allele.nocturnal=Nocturnal -extrabees.genetics.allele.caveDwelling=Cave Dwelling -extrabees.genetics.allele.tolerantFlyer=Rainfall - -extrabees.genetics.corrupted=Corrupted - - - extrabees.branch.barren.name=Barren extrabees.branch.barren.desc=Although initially these bees are considerably useless due to their meagre combs, they can lead onto greater things. extrabees.branch.hostile.name=Hostile @@ -495,17 +398,3 @@ extrabees.effect.bonemealsapling.name=Growth extrabees.effect.bonemealfruit.name=Ripening extrabees.effect.bonemealmushroom.name=Mushroom extrabees.effect.power.name=Power - - - - -extrabees.gui.database.tab.species.overview=Overview -extrabees.gui.database.tab.species.classification=Classification -extrabees.gui.database.tab.species.genome=Genome -extrabees.gui.database.tab.species.products=Products -extrabees.gui.database.tab.species.climate=Climate -extrabees.gui.database.tab.species.resultant=Resultant Mutations -extrabees.gui.database.tab.species.further=Further Mutations -extrabees.gui.database.tab.branches.overview=Overview -extrabees.gui.database.tab.branches.species=Species -extrabees.gui.database.tab.breeder=Breeder \ No newline at end of file diff --git a/src/main/resources/assets/extrabees/models/item/dictionary_master.json b/src/main/resources/assets/extrabees/models/item/dictionary_master.json deleted file mode 100644 index b5a33ed2..00000000 --- a/src/main/resources/assets/extrabees/models/item/dictionary_master.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "extrabees:items/master_apiarist_database" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index c21a8acf..4fa916b8 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -194,3 +194,108 @@ genetics.item.sequence.sequenced=Fully Sequenced bee.modifier.format.max=%.2fx (Max: %.2fx) bee.modifier.format.min=%.2fx (Min: %.2fx) + +##From ExtraBees lang + +extrabees.item.serum.tooltip.nocharge=Empty +extrabees.item.serum.tooltip.charge1=1 Charge +extrabees.item.serum.tooltip.manycharge=%d Charges +extrabees.item.serum.corrupted=Corrupted Serum +extrabees.item.serum.name=%s Serum +extrabees.item.serum.empty=Empty Serum + +extrabees.item.template.corrupted=Corrupted Template +extrabees.item.template.name=%s Template +extrabees.item.template.empty=Blank Template + +extrabees.block.apiaristMachine.name=Apiarist Machine +extrabees.block.geneticMachine.name=Genetic Machine +extrabees.block.advGeneticMachine.name=Advanced Genetic Machine + +extrabees.liquid.dna=Liquid DNA + + +extrabees.genetics.quality.awful=Awful +extrabees.genetics.quality.poor=Poor +extrabees.genetics.quality.average=Average +extrabees.genetics.quality.good=Good +extrabees.genetics.quality.excellent=Excellent + +extrabees.genetics.quality.tooltip=%s Quality + +extrabees.genetics.allele.shortest=Shortest +extrabees.genetics.allele.shorter=Shorter +extrabees.genetics.allele.short=Short +extrabees.genetics.allele.shortened=Shortened +extrabees.genetics.allele.normal=Normal +extrabees.genetics.allele.elongated=Elongated +extrabees.genetics.allele.long=Long +extrabees.genetics.allele.longer=Longer +extrabees.genetics.allele.longest=Longest + +extrabees.genetics.allele.slowest=Slowest +extrabees.genetics.allele.slower=Slower +extrabees.genetics.allele.slow=Slow +extrabees.genetics.allele.norm=Normal +extrabees.genetics.allele.fast=Fast +extrabees.genetics.allele.faster=Faster +extrabees.genetics.allele.fastest=Fastest + +extrabees.genetics.allele.low=Low +extrabees.genetics.allele.high=High +extrabees.genetics.allele.maximum=Maximum + +extrabees.genetics.allele.average=Average + +extrabees.genetics.allele.default=Default +extrabees.genetics.allele.large=Large +extrabees.genetics.allele.larger=Larger +extrabees.genetics.allele.largest=Largest + +extrabees.genetics.allele.none=None +extrabees.genetics.allele.both1=Both 1 +extrabees.genetics.allele.both2=Both 2 +extrabees.genetics.allele.both3=Both 3 +extrabees.genetics.allele.both4=Both 4 +extrabees.genetics.allele.both5=Both 5 +extrabees.genetics.allele.up1=Up 1 +extrabees.genetics.allele.up2=Up 2 +extrabees.genetics.allele.up3=Up 3 +extrabees.genetics.allele.up4=Up 4 +extrabees.genetics.allele.up5=Up 5 +extrabees.genetics.allele.down1=Down 1 +extrabees.genetics.allele.down2=Down 2 +extrabees.genetics.allele.down3=Down 3 +extrabees.genetics.allele.down4=Down 4 +extrabees.genetics.allele.down5=Down 5 + +extrabees.genetics.allele.noeffect=Effect Cancellation +extrabees.genetics.allele.noflower=Non-pollination + +extrabees.genetics.allele.lifespan=%s Lifespan +extrabees.genetics.allele.production=%s Production +extrabees.genetics.allele.fertility=%s Fertility +extrabees.genetics.allele.flowering=%s Flowering +extrabees.genetics.allele.territory=%s Territory +extrabees.genetics.allele.tolerance=%s %s Tol. +extrabees.genetics.allele.species=%s Species +extrabees.genetics.allele.effect=%s Effect +extrabees.genetics.allele.flower=%s Pollination +extrabees.genetics.allele.humidity=Humid. +extrabees.genetics.allele.temperature=Temp. +extrabees.genetics.allele.nocturnal=Nocturnal +extrabees.genetics.allele.caveDwelling=Cave Dwelling +extrabees.genetics.allele.tolerantFlyer=Rainfall + +extrabees.genetics.corrupted=Corrupted + +extrabees.gui.database.tab.species.overview=Overview +extrabees.gui.database.tab.species.classification=Classification +extrabees.gui.database.tab.species.genome=Genome +extrabees.gui.database.tab.species.products=Products +extrabees.gui.database.tab.species.climate=Climate +extrabees.gui.database.tab.species.resultant=Resultant Mutations +extrabees.gui.database.tab.species.further=Further Mutations +extrabees.gui.database.tab.branches.overview=Overview +extrabees.gui.database.tab.branches.species=Species +extrabees.gui.database.tab.breeder=Breeder diff --git a/src/main/resources/assets/extrabees/models/item/dictionary.json b/src/main/resources/assets/genetics/models/item/dictionary.json similarity index 51% rename from src/main/resources/assets/extrabees/models/item/dictionary.json rename to src/main/resources/assets/genetics/models/item/dictionary.json index 54adfc48..1e041936 100644 --- a/src/main/resources/assets/extrabees/models/item/dictionary.json +++ b/src/main/resources/assets/genetics/models/item/dictionary.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "extrabees:items/apiarist_database" + "layer0": "genetics:items/apiarist_database" } } \ No newline at end of file diff --git a/src/main/resources/assets/genetics/models/item/dictionary_master.json b/src/main/resources/assets/genetics/models/item/dictionary_master.json new file mode 100644 index 00000000..74b7f608 --- /dev/null +++ b/src/main/resources/assets/genetics/models/item/dictionary_master.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "genetics:items/master_apiarist_database" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/genetics/textures/gui/punnett.png b/src/main/resources/assets/genetics/textures/gui/punnett.png new file mode 100644 index 00000000..42780195 Binary files /dev/null and b/src/main/resources/assets/genetics/textures/gui/punnett.png differ diff --git a/src/main/resources/assets/extrabees/textures/items/apiarist_database.png b/src/main/resources/assets/genetics/textures/items/apiarist_database.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/apiarist_database.png rename to src/main/resources/assets/genetics/textures/items/apiarist_database.png diff --git a/src/main/resources/assets/extrabees/textures/items/master_apiarist_database.png b/src/main/resources/assets/genetics/textures/items/master_apiarist_database.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/master_apiarist_database.png rename to src/main/resources/assets/genetics/textures/items/master_apiarist_database.png diff --git a/src/main/resources/assets/extrabees/textures/items/punnett_square.png b/src/main/resources/assets/genetics/textures/items/punnett_square.png similarity index 100% rename from src/main/resources/assets/extrabees/textures/items/punnett_square.png rename to src/main/resources/assets/genetics/textures/items/punnett_square.png