From b7da8779633037b662a40a209f8f5dd2240775e2 Mon Sep 17 00:00:00 2001 From: Elec332 Date: Sat, 13 May 2017 18:42:38 +0200 Subject: [PATCH] Moved punnett square and apiarist database to the genetics mod --- .../craftgui/resource/StyleSheetPunnett.java | 2 +- .../extrabees/ExtraBeesIntegration.java | 2 +- .../alveary/AlvearyLogicTransmitter.java | 49 +++++++- .../binnie/extrabees/client/ExtraBeeGUID.java | 9 -- .../extrabees/genetics/ExtraBeesSpecies.java | 6 +- .../binnie/extrabees/init/ItemRegister.java | 3 +- src/main/java/binnie/genetics/Genetics.java | 13 ++ .../binnie/genetics/core/GeneticsGUI.java | 7 +- .../gui/bee}/database/ControlBiomes.java | 2 +- .../gui/bee}/database/ControlClimateBar.java | 2 +- .../gui/bee}/database/ControlProductsBox.java | 2 +- .../bee}/database/ControlProductsItem.java | 2 +- .../gui/bee}/database/PageSpeciesClimate.java | 2 +- .../gui/bee}/database/PageSpeciesGenome.java | 2 +- .../bee}/database/PageSpeciesProducts.java | 2 +- .../bee}/database/WindowApiaristDatabase.java | 2 +- .../gui/bee/database}/package-info.java | 2 +- .../gui/punnett/ControlChromosome.java | 2 +- .../gui/punnett/ControlPunnett.java | 2 +- .../gui/punnett/ExtraBeeGUITexture.java | 2 +- .../gui/punnett/WindowPunnettSquare.java | 48 ++++++-- .../gui/punnett}/package-info.java | 2 +- .../item/ItemBeeDictionary.java} | 23 ++-- .../item}/ItemPunnettSquare.java | 9 +- .../assets/extrabees/lang/en_US.lang | 111 ------------------ .../models/item/dictionary_master.json | 6 - .../resources/assets/genetics/lang/en_US.lang | 105 +++++++++++++++++ .../models/item/dictionary.json | 2 +- .../models/item/dictionary_master.json | 6 + .../assets/genetics/textures/gui/punnett.png | Bin 0 -> 11534 bytes .../textures/items/apiarist_database.png | Bin .../items/master_apiarist_database.png | Bin .../textures/items/punnett_square.png | Bin 33 files changed, 250 insertions(+), 177 deletions(-) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/ControlBiomes.java (97%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/ControlClimateBar.java (98%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/ControlProductsBox.java (97%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/ControlProductsItem.java (96%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/PageSpeciesClimate.java (95%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/PageSpeciesGenome.java (99%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/PageSpeciesProducts.java (96%) rename src/main/java/binnie/{extrabees/client/gui => genetics/gui/bee}/database/WindowApiaristDatabase.java (98%) rename src/main/java/binnie/{extrabees/client/gui/punnett => genetics/gui/bee/database}/package-info.java (84%) rename src/main/java/binnie/{extrabees/client => genetics}/gui/punnett/ControlChromosome.java (96%) rename src/main/java/binnie/{extrabees/client => genetics}/gui/punnett/ControlPunnett.java (98%) rename src/main/java/binnie/{extrabees/client => genetics}/gui/punnett/ExtraBeeGUITexture.java (58%) rename src/main/java/binnie/{extrabees/client => genetics}/gui/punnett/WindowPunnettSquare.java (69%) rename src/main/java/binnie/{extrabees/client/gui/database => genetics/gui/punnett}/package-info.java (83%) rename src/main/java/binnie/{extrabees/items/ItemDictionary.java => genetics/item/ItemBeeDictionary.java} (80%) rename src/main/java/binnie/{extrabees/items => genetics/item}/ItemPunnettSquare.java (79%) delete mode 100644 src/main/resources/assets/extrabees/models/item/dictionary_master.json rename src/main/resources/assets/{extrabees => genetics}/models/item/dictionary.json (51%) create mode 100644 src/main/resources/assets/genetics/models/item/dictionary_master.json create mode 100644 src/main/resources/assets/genetics/textures/gui/punnett.png rename src/main/resources/assets/{extrabees => genetics}/textures/items/apiarist_database.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/master_apiarist_database.png (100%) rename src/main/resources/assets/{extrabees => genetics}/textures/items/punnett_square.png (100%) 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 0000000000000000000000000000000000000000..42780195e5232550baabdae7ce6b5691decedafd GIT binary patch literal 11534 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 literal 0 HcmV?d00001 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