diff --git a/src/main/java/binnie/core/item/DamageItems.java b/src/main/java/binnie/core/item/DamageItems.java index 3ce32b4c..1bbbaff7 100644 --- a/src/main/java/binnie/core/item/DamageItems.java +++ b/src/main/java/binnie/core/item/DamageItems.java @@ -68,11 +68,15 @@ public abstract class DamageItems extends Item { return (damage < ICONS.length && damage >= 0) ? ICONS[damage] : null; } + public String getIconName(int damage) { + return NAMES[damage]; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister register) { for (int i = 0; i < NAMES.length; ++i) { - ICONS[i] = register.registerIcon(modid + ":" + NAMES[i]); + ICONS[i] = register.registerIcon(modid + ":" + getIconName(i)); } } } diff --git a/src/main/java/binnie/extrabees/ExtraBees.java b/src/main/java/binnie/extrabees/ExtraBees.java index 09dc0256..0841bf65 100644 --- a/src/main/java/binnie/extrabees/ExtraBees.java +++ b/src/main/java/binnie/extrabees/ExtraBees.java @@ -1,8 +1,9 @@ package binnie.extrabees; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.item.Item; import com.gtnewhorizon.gtnhlib.config.ConfigException; import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; @@ -37,7 +38,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; guiFactory = "binnie.extrabees.config.EBConfigGUIFactory") public class ExtraBees extends AbstractMod { - public static final String EB_MODID = "ExtraBees"; + public static final String EB_MODID = "extrabees"; public static final String EB_MOD_NAME = "Extra Bees"; @Mod.Instance("ExtraBees") @@ -59,11 +60,6 @@ public class ExtraBees extends AbstractMod { public static Block hive; public static Material materialBeehive; public static Block ectoplasm; - public static Item comb; - public static Item propolis; - public static Item honeyDrop; - public static Item dictionary; - public static Item itemMisc; public ExtraBees() { ExtraBees.instance = this; @@ -90,6 +86,21 @@ public class ExtraBees extends AbstractMod { postInit(); } + @Mod.EventHandler + public void missingMappings(FMLMissingMappingsEvent event) { + for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) { + final String[] name = m.name.split(":"); + if (name.length < 2) continue; + + if (name[0].equals("ExtraBees")) { + if (m.type == GameRegistry.Type.BLOCK) + m.remap(GameRegistry.findBlock(EB_MODID, name[1])); + else + m.remap(GameRegistry.findItem(EB_MODID, name[1])); + } + } + } + @Override public IBinnieGUID[] getGUIDs() { return ExtraBeeGUID.values(); @@ -107,7 +118,7 @@ public class ExtraBees extends AbstractMod { @Override public String getModID() { - return "extrabees"; + return EB_MODID; } @Override diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java deleted file mode 100644 index 73cd2b42..00000000 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ /dev/null @@ -1,213 +0,0 @@ -package binnie.extrabees.core; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; - -import binnie.Binnie; -import binnie.core.Mods; -import binnie.core.item.IItemMisc; -import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import forestry.api.recipes.RecipeManagers; - -public enum ExtraBeeItems implements IItemMisc { - - ScentedGear("scentedGear"), - DiamondShard("diamondShard"), - EmeraldShard("emeraldShard"), - RubyShard("rubyShard"), - SapphireShard("sapphireShard"), - LapisShard("lapisShard"), - IronDust("ironDust"), - GoldDust("goldDust"), - SilverDust("silverDust"), - PlatinumDust("platinumDust"), - CopperDust("copperDust"), - TinDust("tinDust"), - NickelDust("nickelDust"), - LeadDust("leadDust"), - ZincDust("zincDust"), - TitaniumDust("titaniumDust"), - TungstenDust("tungstenDust"), - UraniumDust("radioactiveDust"), - CoalDust("coalDust"), - RedDye("dyeRed"), - YellowDye("dyeYellow"), - BlueDye("dyeBlue"), - GreenDye("dyeGreen"), - WhiteDye("dyeWhite"), - BlackDye("dyeBlack"), - BrownDye("dyeBrown"), - ClayDust("clayDust"), - YelloriumDust("yelloriumDust"), - BlutoniumDust("blutoniumDust"), - CyaniteDust("cyaniteDust"); - - static { - ExtraBeeItems.TinDust.setMetal("Tin"); - ExtraBeeItems.ZincDust.setMetal("Zinc"); - ExtraBeeItems.CopperDust.setMetal("Copper"); - ExtraBeeItems.IronDust.setMetal("Iron"); - ExtraBeeItems.NickelDust.setMetal("Nickel"); - ExtraBeeItems.LeadDust.setMetal("Lead"); - ExtraBeeItems.SilverDust.setMetal("Silver"); - ExtraBeeItems.GoldDust.setMetal("Gold"); - ExtraBeeItems.PlatinumDust.setMetal("Platinum"); - ExtraBeeItems.TungstenDust.setMetal("Tungsten"); - ExtraBeeItems.TitaniumDust.setMetal("Titanium"); - ExtraBeeItems.CoalDust.setMetal("Coal"); - ExtraBeeItems.YelloriumDust.setMetal("Yellorium"); - ExtraBeeItems.BlutoniumDust.setMetal("Blutonium"); - ExtraBeeItems.CyaniteDust.setMetal("Cyanite"); - ExtraBeeItems.DiamondShard.setGem("Diamond"); - ExtraBeeItems.EmeraldShard.setGem("Emerald"); - ExtraBeeItems.RubyShard.setGem("Ruby"); - ExtraBeeItems.SapphireShard.setGem("Sapphire"); - } - - protected String name; - protected String iconPath; - protected IIcon icon; - protected String metalString; - protected String gemString; - - ExtraBeeItems(String name) { - this.name = name; - this.iconPath = name; - metalString = null; - gemString = null; - } - - public static void init() { - OreDictionary.registerOre("dyeRed", ExtraBeeItems.RedDye.get(1)); - OreDictionary.registerOre("dyeYellow", ExtraBeeItems.YellowDye.get(1)); - OreDictionary.registerOre("dyeBlue", ExtraBeeItems.BlueDye.get(1)); - OreDictionary.registerOre("dyeGreen", ExtraBeeItems.GreenDye.get(1)); - OreDictionary.registerOre("dyeBlack", ExtraBeeItems.BlackDye.get(1)); - OreDictionary.registerOre("dyeWhite", ExtraBeeItems.WhiteDye.get(1)); - OreDictionary.registerOre("dyeBrown", ExtraBeeItems.BrownDye.get(1)); - } - - public static void postInit() { - ItemStack lapisShard = ExtraBeeItems.LapisShard.get(1); - GameRegistry.addShapelessRecipe(new ItemStack(Items.dye, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); - for (ExtraBeeItems item : values()) { - if (item.metalString != null) { - ItemStack dust = null; - ItemStack ingot = null; - if (!OreDictionary.getOres("ingot" + item.metalString).isEmpty()) { - ingot = OreDictionary.getOres("ingot" + item.metalString).get(0).copy(); - } - if (!OreDictionary.getOres("dust" + item.metalString).isEmpty()) { - dust = OreDictionary.getOres("dust" + item.metalString).get(0).copy(); - } - - ItemStack input = item.get(1); - if (dust != null) { - GameRegistry.addShapelessRecipe(dust, input, input, input, input); - } else if (ingot != null) { - GameRegistry - .addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); - } else if (item == ExtraBeeItems.CoalDust) { - GameRegistry.addShapelessRecipe(new ItemStack(Items.coal), input, input, input, input); - } - } else if (item.gemString != null) { - ItemStack gem = null; - if (!OreDictionary.getOres("gem" + item.gemString).isEmpty()) { - gem = OreDictionary.getOres("gem" + item.gemString).get(0); - } - - ItemStack input2 = item.get(1); - if (gem != null) { - GameRegistry.addShapelessRecipe( - gem.copy(), - input2, - input2, - input2, - input2, - input2, - input2, - input2, - input2, - input2); - } - } - } - - Item woodGear = null; - try { - woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null); - } catch (Exception ex) { - // ignored - } - - ItemStack gear = new ItemStack(Blocks.planks, 1); - if (woodGear != null) { - gear = new ItemStack(woodGear, 1); - } - - RecipeManagers.carpenterManager.addRecipe( - 100, - Binnie.Liquid.getLiquidStack("for.honey", 500), - null, - ExtraBeeItems.ScentedGear.get(1), - " j ", - "bgb", - " p ", - 'j', - Mods.forestry.item("royalJelly"), - 'b', - Mods.forestry.item("beeswax"), - 'p', - Mods.forestry.item("pollen"), - 'g', - gear); - } - - private void setGem(String string) { - gemString = string; - } - - private void setMetal(String string) { - metalString = string; - } - - @Override - public boolean isActive() { - if (metalString != null) { - return !OreDictionary.getOres("ingot" + metalString).isEmpty() - || !OreDictionary.getOres("dust" + metalString).isEmpty() - || this == ExtraBeeItems.CoalDust; - } - return gemString == null || !OreDictionary.getOres("gem" + gemString).isEmpty(); - } - - @Override - public IIcon getIcon(ItemStack itemStack) { - return icon; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerIcons(IIconRegister register) { - icon = ExtraBees.proxy.getIcon(register, "misc/" + iconPath); - } - - @Override - public String getName(ItemStack itemStack) { - return I18N.localise("extrabees.item." + name); - } - - @Override - public ItemStack get(int count) { - return new ItemStack(ExtraBees.itemMisc, count, ordinal()); - } -} diff --git a/src/main/java/binnie/extrabees/core/ModuleCore.java b/src/main/java/binnie/extrabees/core/ModuleCore.java index 3f914f26..cecdce63 100644 --- a/src/main/java/binnie/extrabees/core/ModuleCore.java +++ b/src/main/java/binnie/extrabees/core/ModuleCore.java @@ -1,24 +1,27 @@ package binnie.extrabees.core; -import binnie.Binnie; + +import static binnie.extrabees.item.EBItems.itemMisc; + import binnie.core.IInitializable; -import binnie.extrabees.ExtraBees; -import forestry.api.core.Tabs; +import binnie.extrabees.item.EBMisc; public class ModuleCore implements IInitializable { @Override public void preInit() { - ExtraBees.itemMisc = Binnie.Item.registerMiscItems(ExtraBeeItems.values(), Tabs.tabApiculture); + // Loads EBItems.class, guaranteeing that items are init by this point + // TODO: is this needed? + itemMisc.getUnlocalizedName(); } @Override public void init() { - ExtraBeeItems.init(); + EBMisc.init(); } @Override public void postInit() { - ExtraBeeItems.postInit(); + EBMisc.postInit(); } } diff --git a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java index d56d6cd6..093644cc 100644 --- a/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java +++ b/src/main/java/binnie/extrabees/genetics/ModuleGenetics.java @@ -1,19 +1,18 @@ package binnie.extrabees.genetics; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - import binnie.Binnie; import binnie.core.IInitializable; import binnie.extrabees.ExtraBees; import binnie.extrabees.genetics.effect.BlockEctoplasm; import binnie.extrabees.genetics.effect.ExtraBeesEffect; -import binnie.extrabees.genetics.items.ItemDictionary; +import binnie.extrabees.item.EBItems; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.IGenome; import forestry.api.recipes.RecipeManagers; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; public class ModuleGenetics implements IInitializable { @@ -24,8 +23,6 @@ public class ModuleGenetics implements IInitializable { @Override public void preInit() { - ExtraBees.dictionary = new ItemDictionary(); - ExtraBees.ectoplasm = new BlockEctoplasm(); GameRegistry.registerBlock(ExtraBees.ectoplasm, "ectoplasm"); } @@ -43,7 +40,7 @@ public class ModuleGenetics implements IInitializable { 100, Binnie.Liquid.getLiquidStack("water", 2000), null, - new ItemStack(ExtraBees.dictionary), + new ItemStack(EBItems.dictionary), "X#X", "YEY", "RDR", diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index bbb5df2c..a764e9e8 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -1,5 +1,6 @@ package binnie.extrabees.genetics.items; +import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -22,9 +23,13 @@ public class ItemDictionary extends Item { protected IIcon iconMaster; public ItemDictionary() { + final String name = "dictionary"; + setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("dictionary"); + setUnlocalizedName(name); setMaxStackSize(1); + + GameRegistry.registerItem(this, name); } @Override @@ -70,7 +75,7 @@ public class ItemDictionary extends Item { @Override public String getItemStackDisplayName(ItemStack stack) { - return (stack.getItemDamage() == 0) ? I18N.localise("extrabees.item.database") - : I18N.localise("extrabees.item.masterDatabase"); + return (stack.getItemDamage() == 0) ? I18N.localise("extrabees.item.database.name") + : I18N.localise("extrabees.item.masterDatabase.name"); } } diff --git a/src/main/java/binnie/extrabees/item/EBItems.java b/src/main/java/binnie/extrabees/item/EBItems.java new file mode 100644 index 00000000..47c30943 --- /dev/null +++ b/src/main/java/binnie/extrabees/item/EBItems.java @@ -0,0 +1,16 @@ +package binnie.extrabees.item; + +import binnie.core.item.DamageItems; +import binnie.extrabees.genetics.items.ItemDictionary; +import binnie.extrabees.products.ItemHoneyComb; +import binnie.extrabees.products.ItemHoneyDrop; +import binnie.extrabees.products.ItemPropolis; +import net.minecraft.item.Item; + +public class EBItems { + public final static DamageItems itemMisc = new EBMisc(); + public final static Item comb = new ItemHoneyComb(); + public final static Item propolis = new ItemPropolis(); + public final static Item honeyDrop = new ItemHoneyDrop(); + public static Item dictionary = new ItemDictionary(); +} diff --git a/src/main/java/binnie/extrabees/item/EBMisc.java b/src/main/java/binnie/extrabees/item/EBMisc.java new file mode 100644 index 00000000..e93f6878 --- /dev/null +++ b/src/main/java/binnie/extrabees/item/EBMisc.java @@ -0,0 +1,169 @@ +package binnie.extrabees.item; + +import static binnie.extrabees.ExtraBees.EB_MODID; +import static binnie.extrabees.item.EBItems.itemMisc; + +import binnie.Binnie; +import binnie.core.Mods; +import binnie.core.item.DamageItems; +import cpw.mods.fml.common.registry.GameRegistry; +import forestry.api.core.Tabs; +import forestry.api.recipes.RecipeManagers; +import java.util.Arrays; +import net.minecraft.init.Blocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class EBMisc extends DamageItems { + public enum Items { + ScentedGear("scentedGear"), + DiamondShard("diamondShard", "Diamond", false), + EmeraldShard("emeraldShard", "Emerald", false), + RubyShard("rubyShard", "Ruby", false), + SapphireShard("sapphireShard", "Sapphire", false), + LapisShard("lapisShard"), + IronDust("ironDust", "Iron", true), + GoldDust("goldDust", "Gold", true), + SilverDust("silverDust", "Silver", true), + PlatinumDust("platinumDust", "Platinum", true), + CopperDust("copperDust", "Copper", true), + TinDust("tinDust", "Tin", true), + NickelDust("nickelDust", "Nickel", true), + LeadDust("leadDust", "Lead", true), + ZincDust("zincDust", "Zinc", true), + TitaniumDust("titaniumDust", "Titanium", true), + TungstenDust("tungstenDust", "Tungsten", true), + UraniumDust("radioactiveDust"), + // Don't look at me, it was like this when I got here + CoalDust("coalDust", "Coal", true), + RedDye("dyeRed"), + YellowDye("dyeYellow"), + BlueDye("dyeBlue"), + GreenDye("dyeGreen"), + WhiteDye("dyeWhite"), + BlackDye("dyeBlack"), + BrownDye("dyeBrown"), + ClayDust("clayDust"), + YelloriumDust("yelloriumDust", "Yellorium", true), + BlutoniumDust("blutoniumDust", "Blutonium", true), + CyaniteDust("cyaniteDust", "Cyanite", true); + + final String name; + final String resourceString; + final boolean isMetal; + private static final Items[] VALUES = values(); + + Items(String name) { + this(name, null, false); + } + + Items(String name, String resourceString, boolean isMetal) { + this.name = name; + this.resourceString = resourceString; + this.isMetal = isMetal; + } + + public ItemStack get(int count) { + return itemMisc.getStack(count, ordinal()); + } + } + + protected EBMisc() { + super( + Tabs.tabApiculture, + EB_MODID, + Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); + } + + @Override + public String getIconName(int damage) { + return "misc/" + super.getIconName(damage); + } + + public static void init() { + OreDictionary.registerOre("dyeRed", Items.RedDye.get(1)); + OreDictionary.registerOre("dyeYellow", Items.YellowDye.get(1)); + OreDictionary.registerOre("dyeBlue", Items.BlueDye.get(1)); + OreDictionary.registerOre("dyeGreen", Items.GreenDye.get(1)); + OreDictionary.registerOre("dyeBlack", Items.BlackDye.get(1)); + OreDictionary.registerOre("dyeWhite", Items.WhiteDye.get(1)); + OreDictionary.registerOre("dyeBrown", Items.BrownDye.get(1)); + } + + public static void postInit() { + ItemStack lapisShard = Items.LapisShard.get(1); + GameRegistry.addShapelessRecipe(new ItemStack(net.minecraft.init.Items.dye, 1, 4), lapisShard, lapisShard, lapisShard, lapisShard); + for (Items item : Items.VALUES) { + if (item.resourceString != null && item.isMetal) { + ItemStack dust = null; + ItemStack ingot = null; + if (!OreDictionary.getOres("ingot" + item.resourceString).isEmpty()) { + ingot = OreDictionary.getOres("ingot" + item.resourceString).get(0).copy(); + } + if (!OreDictionary.getOres("dust" + item.resourceString).isEmpty()) { + dust = OreDictionary.getOres("dust" + item.resourceString).get(0).copy(); + } + + ItemStack input = item.get(1); + if (dust != null) { + GameRegistry.addShapelessRecipe(dust, input, input, input, input); + } else if (ingot != null) { + GameRegistry + .addShapelessRecipe(ingot, input, input, input, input, input, input, input, input, input); + } else if (item == Items.CoalDust) { + GameRegistry.addShapelessRecipe(new ItemStack(net.minecraft.init.Items.coal), input, input, input, input); + } + } else if (item.resourceString != null) { + ItemStack gem = null; + if (!OreDictionary.getOres("gem" + item.resourceString).isEmpty()) { + gem = OreDictionary.getOres("gem" + item.resourceString).get(0); + } + + ItemStack input2 = item.get(1); + if (gem != null) { + GameRegistry.addShapelessRecipe( + gem.copy(), + input2, + input2, + input2, + input2, + input2, + input2, + input2, + input2, + input2); + } + } + } + + Item woodGear = null; + try { + woodGear = (Item) Class.forName("buildcraft.BuildCraftCore").getField("woodenGearItem").get(null); + } catch (Exception ex) { + // ignored + } + + ItemStack gear = new ItemStack(Blocks.planks, 1); + if (woodGear != null) { + gear = new ItemStack(woodGear, 1); + } + + RecipeManagers.carpenterManager.addRecipe( + 100, + Binnie.Liquid.getLiquidStack("for.honey", 500), + null, + Items.ScentedGear.get(1), + " j ", + "bgb", + " p ", + 'j', + Mods.forestry.item("royalJelly"), + 'b', + Mods.forestry.item("beeswax"), + 'p', + Mods.forestry.item("pollen"), + 'g', + gear); + } +} diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java index dd288d42..05acc9be 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyComb.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import binnie.extrabees.item.EBItems; import java.awt.Color; import java.util.LinkedHashMap; import java.util.Locale; @@ -9,7 +10,6 @@ import net.minecraft.item.ItemStack; import binnie.core.item.IItemEnum; import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; public enum EnumHoneyComb implements IItemEnum { @@ -134,7 +134,7 @@ public enum EnumHoneyComb implements IItemEnum { @Override public ItemStack get(int count) { - return new ItemStack(ExtraBees.comb, count, ordinal()); + return new ItemStack(EBItems.comb, count, ordinal()); } @Override @@ -154,11 +154,6 @@ public enum EnumHoneyComb implements IItemEnum { active = addProduct(item, chance); } - public void tryAddProduct(IItemEnum type, Float chance) { - tryAddProduct(type.get(1), chance); - active = active && type.isActive(); - } - public void copyProducts(EnumHoneyComb comb) { products.putAll(comb.products); } diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index 05e6967b..5e04b624 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import binnie.extrabees.item.EBItems; import java.awt.Color; import javax.annotation.Nonnull; @@ -11,7 +12,6 @@ import net.minecraftforge.fluids.FluidStack; import binnie.Binnie; import binnie.core.item.IItemEnum; import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; public enum EnumHoneyDrop implements IItemEnum { @@ -85,7 +85,7 @@ public enum EnumHoneyDrop implements IItemEnum { @Override public ItemStack get(int count) { - return new ItemStack(ExtraBees.honeyDrop, count, ordinal()); + return new ItemStack(EBItems.honeyDrop, count, ordinal()); } @Override diff --git a/src/main/java/binnie/extrabees/products/EnumPropolis.java b/src/main/java/binnie/extrabees/products/EnumPropolis.java index 61befd18..14708680 100644 --- a/src/main/java/binnie/extrabees/products/EnumPropolis.java +++ b/src/main/java/binnie/extrabees/products/EnumPropolis.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import binnie.extrabees.item.EBItems; import java.awt.Color; import net.minecraft.item.ItemStack; @@ -8,7 +9,6 @@ import net.minecraftforge.fluids.FluidStack; import binnie.Binnie; import binnie.core.item.IItemEnum; import binnie.core.util.I18N; -import binnie.extrabees.ExtraBees; import forestry.api.recipes.RecipeManagers; public enum EnumPropolis implements IItemEnum { @@ -57,7 +57,7 @@ public enum EnumPropolis implements IItemEnum { @Override public ItemStack get(int count) { - return new ItemStack(ExtraBees.propolis, count, ordinal()); + return new ItemStack(EBItems.propolis, count, ordinal()); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java index fbb1c0ef..29f96e02 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyComb.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyComb.java @@ -1,5 +1,34 @@ package binnie.extrabees.products; +import static binnie.extrabees.item.EBMisc.Items.BlackDye; +import static binnie.extrabees.item.EBMisc.Items.BlueDye; +import static binnie.extrabees.item.EBMisc.Items.BlutoniumDust; +import static binnie.extrabees.item.EBMisc.Items.BrownDye; +import static binnie.extrabees.item.EBMisc.Items.CoalDust; +import static binnie.extrabees.item.EBMisc.Items.CopperDust; +import static binnie.extrabees.item.EBMisc.Items.CyaniteDust; +import static binnie.extrabees.item.EBMisc.Items.DiamondShard; +import static binnie.extrabees.item.EBMisc.Items.EmeraldShard; +import static binnie.extrabees.item.EBMisc.Items.GoldDust; +import static binnie.extrabees.item.EBMisc.Items.GreenDye; +import static binnie.extrabees.item.EBMisc.Items.IronDust; +import static binnie.extrabees.item.EBMisc.Items.LeadDust; +import static binnie.extrabees.item.EBMisc.Items.NickelDust; +import static binnie.extrabees.item.EBMisc.Items.PlatinumDust; +import static binnie.extrabees.item.EBMisc.Items.RedDye; +import static binnie.extrabees.item.EBMisc.Items.RubyShard; +import static binnie.extrabees.item.EBMisc.Items.SapphireShard; +import static binnie.extrabees.item.EBMisc.Items.SilverDust; +import static binnie.extrabees.item.EBMisc.Items.TinDust; +import static binnie.extrabees.item.EBMisc.Items.TitaniumDust; +import static binnie.extrabees.item.EBMisc.Items.TungstenDust; +import static binnie.extrabees.item.EBMisc.Items.WhiteDye; +import static binnie.extrabees.item.EBMisc.Items.YelloriumDust; +import static binnie.extrabees.item.EBMisc.Items.YellowDye; +import static binnie.extrabees.item.EBMisc.Items.ZincDust; + +import binnie.extrabees.item.EBItems; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -9,8 +38,6 @@ import net.minecraftforge.oredict.OreDictionary; import binnie.core.BinnieCore; import binnie.core.Mods; -import binnie.extrabees.ExtraBees; -import binnie.extrabees.core.ExtraBeeItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; @@ -22,8 +49,12 @@ public class ItemHoneyComb extends ItemProduct { public ItemHoneyComb() { super(EnumHoneyComb.values()); + final String name = "honeyComb"; + setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyComb"); + setUnlocalizedName(name); + + GameRegistry.registerItem(this, name); } public static void addSubtypes() { @@ -46,35 +77,35 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.BONE.addProduct(honeyDrop, 0.20f); EnumHoneyComb.BONE.addProduct(new ItemStack(Items.dye, 1, 15), 0.80f); - EnumHoneyComb.OIL.tryAddProduct(EnumPropolis.OIL, 0.60f); + EnumHoneyComb.OIL.tryAddProduct(EnumPropolis.OIL.get(1), 0.60f); EnumHoneyComb.OIL.addProduct(honeyDrop, 0.75f); EnumHoneyComb.COAL.addProduct(beeswax, 0.80f); EnumHoneyComb.COAL.addProduct(honeyDrop, 0.75f); - EnumHoneyComb.COAL.tryAddProduct(ExtraBeeItems.CoalDust, 1.00f); + EnumHoneyComb.COAL.tryAddProduct(CoalDust.get(1), 1.00f); - EnumHoneyComb.WATER.tryAddProduct(EnumPropolis.WATER, 1.00f); + EnumHoneyComb.WATER.tryAddProduct(EnumPropolis.WATER.get(1), 1.00f); EnumHoneyComb.WATER.addProduct(honeyDrop, 0.90f); EnumHoneyComb.STONE.addProduct(beeswax, 0.50f); EnumHoneyComb.STONE.addProduct(honeyDrop, 0.25f); - EnumHoneyComb.MILK.tryAddProduct(EnumHoneyDrop.MILK, 1.00f); + EnumHoneyComb.MILK.tryAddProduct(EnumHoneyDrop.MILK.get(1), 1.00f); EnumHoneyComb.MILK.addProduct(honeyDrop, 0.90f); - EnumHoneyComb.FRUIT.tryAddProduct(EnumHoneyDrop.APPLE, 1.00f); + EnumHoneyComb.FRUIT.tryAddProduct(EnumHoneyDrop.APPLE.get(1), 1.00f); EnumHoneyComb.FRUIT.addProduct(honeyDrop, 0.90f); - EnumHoneyComb.SEED.tryAddProduct(EnumHoneyDrop.SEED, 1.00f); + EnumHoneyComb.SEED.tryAddProduct(EnumHoneyDrop.SEED.get(1), 1.00f); EnumHoneyComb.SEED.addProduct(honeyDrop, 0.90f); - EnumHoneyComb.ALCOHOL.tryAddProduct(EnumHoneyDrop.ALCOHOL, 1.00f); + EnumHoneyComb.ALCOHOL.tryAddProduct(EnumHoneyDrop.ALCOHOL.get(1), 1.00f); EnumHoneyComb.ALCOHOL.addProduct(honeyDrop, 0.90f); - EnumHoneyComb.FUEL.tryAddProduct(EnumPropolis.FUEL, 0.60f); + EnumHoneyComb.FUEL.tryAddProduct(EnumPropolis.FUEL.get(1), 0.60f); EnumHoneyComb.FUEL.addProduct(honeyDrop, 0.50f); - EnumHoneyComb.CREOSOTE.tryAddProduct(EnumPropolis.CREOSOTE, 0.70f); + EnumHoneyComb.CREOSOTE.tryAddProduct(EnumPropolis.CREOSOTE.get(1), 0.70f); EnumHoneyComb.CREOSOTE.addProduct(honeyDrop, 0.50f); EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f); @@ -95,25 +126,25 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.IC2ENERGY.addProduct(beeswax, 0.80f); EnumHoneyComb.IC2ENERGY.addProduct(new ItemStack(Items.redstone, 1, 0), 0.75f); - EnumHoneyComb.IC2ENERGY.tryAddProduct(EnumHoneyDrop.ENERGY, 1.00f); + EnumHoneyComb.IC2ENERGY.tryAddProduct(EnumHoneyDrop.ENERGY.get(1), 1.00f); EnumHoneyComb.IRON.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.IRON.tryAddProduct(ExtraBeeItems.IronDust, 1.00f); + EnumHoneyComb.IRON.tryAddProduct(IronDust.get(1), 1.00f); EnumHoneyComb.GOLD.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.GOLD.tryAddProduct(ExtraBeeItems.GoldDust, 1.00f); + EnumHoneyComb.GOLD.tryAddProduct(GoldDust.get(1), 1.00f); EnumHoneyComb.COPPER.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.COPPER.tryAddProduct(ExtraBeeItems.CopperDust, 1.00f); + EnumHoneyComb.COPPER.tryAddProduct(CopperDust.get(1), 1.00f); EnumHoneyComb.TIN.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.TIN.tryAddProduct(ExtraBeeItems.TinDust, 1.00f); + EnumHoneyComb.TIN.tryAddProduct(TinDust.get(1), 1.00f); EnumHoneyComb.NICKEL.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.NICKEL.tryAddProduct(ExtraBeeItems.NickelDust, 1.00f); + EnumHoneyComb.NICKEL.tryAddProduct(NickelDust.get(1), 1.00f); EnumHoneyComb.SILVER.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.SILVER.tryAddProduct(ExtraBeeItems.SilverDust, 1.00f); + EnumHoneyComb.SILVER.tryAddProduct(SilverDust.get(1), 1.00f); EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE); if (!OreDictionary.getOres("crushedUranium").isEmpty()) { @@ -132,13 +163,13 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.red_mushroom_block, 1, 0), 0.75f); EnumHoneyComb.ACIDIC.addProduct(beeswax, 0.80f); - EnumHoneyComb.ACIDIC.tryAddProduct(EnumHoneyDrop.ACID, 0.50f); + EnumHoneyComb.ACIDIC.tryAddProduct(EnumHoneyDrop.ACID.get(1), 0.50f); if (!OreDictionary.getOres("dustSulfur").isEmpty()) { EnumHoneyComb.ACIDIC.addProduct(OreDictionary.getOres("dustSulfur").get(0), 0.75f); } EnumHoneyComb.VENOMOUS.addProduct(beeswax, 0.80f); - EnumHoneyComb.VENOMOUS.tryAddProduct(EnumHoneyDrop.POISON, 0.80f); + EnumHoneyComb.VENOMOUS.tryAddProduct(EnumHoneyDrop.POISON.get(1), 0.80f); EnumHoneyComb.SLIME.addProduct(beeswax, 1.00f); EnumHoneyComb.SLIME.addProduct(honeyDrop, 0.75f); @@ -151,7 +182,7 @@ public class ItemHoneyComb extends ItemProduct { EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f); EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f); - EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE, 0.80f); + EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE.get(1), 0.80f); EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f); EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f); @@ -162,34 +193,34 @@ public class ItemHoneyComb extends ItemProduct { } EnumHoneyComb.LEAD.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.LEAD.tryAddProduct(ExtraBeeItems.LeadDust, 1.00f); + EnumHoneyComb.LEAD.tryAddProduct(LeadDust.get(1), 1.00f); EnumHoneyComb.ZINC.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.ZINC.tryAddProduct(ExtraBeeItems.ZincDust, 1.00f); + EnumHoneyComb.ZINC.tryAddProduct(ZincDust.get(1), 1.00f); EnumHoneyComb.TITANIUM.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.TITANIUM.tryAddProduct(ExtraBeeItems.TitaniumDust, 1.00f); + EnumHoneyComb.TITANIUM.tryAddProduct(TitaniumDust.get(1), 1.00f); EnumHoneyComb.TUNGSTEN.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.TUNGSTEN.tryAddProduct(ExtraBeeItems.TungstenDust, 1.00f); + EnumHoneyComb.TUNGSTEN.tryAddProduct(TungstenDust.get(1), 1.00f); EnumHoneyComb.PLATINUM.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.PLATINUM.tryAddProduct(ExtraBeeItems.PlatinumDust, 1.00f); + EnumHoneyComb.PLATINUM.tryAddProduct(PlatinumDust.get(1), 1.00f); EnumHoneyComb.LAPIS.copyProducts(EnumHoneyComb.STONE); EnumHoneyComb.LAPIS.addProduct(new ItemStack(Items.dye, 6, 4), 1.00f); EnumHoneyComb.EMERALD.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.EMERALD.tryAddProduct(ExtraBeeItems.EmeraldShard, 1.00f); + EnumHoneyComb.EMERALD.tryAddProduct(EmeraldShard.get(1), 1.00f); EnumHoneyComb.RUBY.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.RUBY.tryAddProduct(ExtraBeeItems.RubyShard, 1.00f); + EnumHoneyComb.RUBY.tryAddProduct(RubyShard.get(1), 1.00f); EnumHoneyComb.SAPPHIRE.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.SAPPHIRE.tryAddProduct(ExtraBeeItems.SapphireShard, 1.00f); + EnumHoneyComb.SAPPHIRE.tryAddProduct(SapphireShard.get(1), 1.00f); EnumHoneyComb.DIAMOND.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.DIAMOND.tryAddProduct(ExtraBeeItems.DiamondShard, 1.00f); + EnumHoneyComb.DIAMOND.tryAddProduct(DiamondShard.get(1), 1.00f); EnumHoneyComb.RED.addProduct(honeyDrop, 0.80f); EnumHoneyComb.RED.addProduct(beeswax, 0.80f); @@ -222,14 +253,14 @@ public class ItemHoneyComb extends ItemProduct { } EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.YELLORIUM.tryAddProduct(ExtraBeeItems.YelloriumDust, 0.25f); + EnumHoneyComb.YELLORIUM.tryAddProduct(YelloriumDust.get(1), 0.25f); EnumHoneyComb.CYANITE.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.CYANITE.tryAddProduct(ExtraBeeItems.CyaniteDust, 0.25f); + EnumHoneyComb.CYANITE.tryAddProduct(CyaniteDust.get(1), 0.25f); EnumHoneyComb.BLUTONIUM.copyProducts(EnumHoneyComb.STONE); - EnumHoneyComb.BLUTONIUM.tryAddProduct(ExtraBeeItems.BlutoniumDust, 0.25f); - OreDictionary.registerOre("beeComb", new ItemStack(ExtraBees.comb, 1, 32767)); + EnumHoneyComb.BLUTONIUM.tryAddProduct(BlutoniumDust.get(1), 0.25f); + OreDictionary.registerOre("beeComb", new ItemStack(EBItems.comb, 1, 32767)); for (int i = 0; i < 16; ++i) { EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i]; @@ -244,13 +275,13 @@ public class ItemHoneyComb extends ItemProduct { int[] dyeC = { 1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7 }; int k = dyeC[i]; ItemStack dye = switch (k) { - case 0 -> ExtraBeeItems.BlackDye.get(1); - case 1 -> ExtraBeeItems.RedDye.get(1); - case 2 -> ExtraBeeItems.GreenDye.get(1); - case 3 -> ExtraBeeItems.BrownDye.get(1); - case 4 -> ExtraBeeItems.BlueDye.get(1); - case 11 -> ExtraBeeItems.YellowDye.get(1); - case 15 -> ExtraBeeItems.WhiteDye.get(1); + case 0 -> BlackDye.get(1); + case 1 -> RedDye.get(1); + case 2 -> GreenDye.get(1); + case 3 -> BrownDye.get(1); + case 4 -> BlueDye.get(1); + case 11 -> YellowDye.get(1); + case 15 -> WhiteDye.get(1); default -> new ItemStack(Items.dye, 1, k); }; type.addProduct(drop.get(1), 1.00f); diff --git a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java index 8a44cf03..2e7aa963 100644 --- a/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/ItemHoneyDrop.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -16,8 +17,12 @@ public class ItemHoneyDrop extends ItemProduct { public ItemHoneyDrop() { super(EnumHoneyDrop.values()); + final String name = "honeyDrop"; + setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("honeyDrop"); + setUnlocalizedName(name); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemPropolis.java b/src/main/java/binnie/extrabees/products/ItemPropolis.java index 0278cb9f..337975db 100644 --- a/src/main/java/binnie/extrabees/products/ItemPropolis.java +++ b/src/main/java/binnie/extrabees/products/ItemPropolis.java @@ -1,5 +1,6 @@ package binnie.extrabees.products; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; @@ -12,8 +13,12 @@ public class ItemPropolis extends ItemProduct { public ItemPropolis() { super(EnumPropolis.values()); + final String name = "propolis"; + setCreativeTab(Tabs.tabApiculture); - setUnlocalizedName("propolis"); + setUnlocalizedName(name); + + GameRegistry.registerItem(this, name); } @Override diff --git a/src/main/java/binnie/extrabees/products/ModuleProducts.java b/src/main/java/binnie/extrabees/products/ModuleProducts.java index 6fd48fec..d3ec1384 100644 --- a/src/main/java/binnie/extrabees/products/ModuleProducts.java +++ b/src/main/java/binnie/extrabees/products/ModuleProducts.java @@ -1,18 +1,13 @@ package binnie.extrabees.products; +import binnie.core.IInitializable; import net.minecraft.init.Items; import net.minecraftforge.oredict.OreDictionary; -import binnie.core.IInitializable; -import binnie.extrabees.ExtraBees; - public class ModuleProducts implements IInitializable { @Override public void preInit() { - ExtraBees.honeyDrop = new ItemHoneyDrop(); - ExtraBees.comb = new ItemHoneyComb(); - ExtraBees.propolis = new ItemPropolis(); OreDictionary.registerOre("ingotIron", Items.iron_ingot); OreDictionary.registerOre("ingotGold", Items.gold_ingot); OreDictionary.registerOre("gemDiamond", Items.diamond); diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index a7d16e9e..b97dfa95 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -19,6 +19,7 @@ import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; +import binnie.extrabees.item.EBItems; import binnie.extratrees.item.ETItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -34,7 +35,6 @@ import binnie.core.IInitializable; import binnie.core.Mods; import binnie.core.liquid.ItemFluidContainer; import binnie.core.resource.BinnieIcon; -import binnie.extrabees.ExtraBees; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; @@ -297,7 +297,7 @@ public class ModuleItem implements IInitializable { // like items. // should be refactored in their respective modules. ItemStack registryStack = new ItemStack(registry); - Item beeDb = ExtraBees.dictionary; + Item beeDb = EBItems.dictionary; Item treeDb = ETItems.itemDictionary; Item flwrDb = Botany.database; diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index cc5a1635..0232cf30 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -11,7 +11,7 @@ import binnie.core.machines.IMachine; import binnie.core.machines.MachineComponent; import binnie.core.machines.component.IInteraction; import binnie.core.machines.network.INetwork; -import binnie.extrabees.ExtraBees; +import binnie.extrabees.item.EBItems; import binnie.extratrees.item.ETItems; import buildcraft.api.tools.IToolWrench; import java.util.ArrayList; @@ -121,7 +121,7 @@ public class ComponentGUIHolder extends MachineComponent implements INetwork.Til validSelections.add(Botany.database); if (BinnieCore.isExtraBeesActive()) { - validSelections.add(ExtraBees.dictionary); + validSelections.add(EBItems.dictionary); } if (BinnieCore.isExtraTreesActive()) { validSelections.add(ETItems.itemDictionary); diff --git a/src/main/resources/assets/extrabees/lang/en_GB.lang b/src/main/resources/assets/extrabees/lang/en_GB.lang index 348338c6..f64a2b80 100644 --- a/src/main/resources/assets/extrabees/lang/en_GB.lang +++ b/src/main/resources/assets/extrabees/lang/en_GB.lang @@ -4,7 +4,7 @@ extrabees.item.comb.lightgray=Light Grey Tinted Comb extrabees.item.honeydrop.gray=Grey Tinted Honey extrabees.item.honeydrop.lightgray=Light Grey Tinted Honey -extrabees.branch.rocky.desc=Found amongst the rocks, these bees have very high tolerance to adverse conditions. +for.genus.bees.rocky.description=Found amongst the rocks, these bees have very high tolerance to adverse conditions. extrabees.species.rotten.desc=These bees have an unusual attraction to dead, rotting meat and will store it in their combs. The smell also attracts other unsavoury types.|Apiarist Manual extrabees.species.red.desc=Don't let them sting you, or you may be seeing red.|Apiarist Manual extrabees.species.green.desc=Perhaps it is an attempt at camouflage, but these bees have begun producing dyes that match the colour of leaves and grass.|Apiarist Manual diff --git a/src/main/resources/assets/extrabees/lang/en_US.lang b/src/main/resources/assets/extrabees/lang/en_US.lang index fe5029ba..bea61082 100644 --- a/src/main/resources/assets/extrabees/lang/en_US.lang +++ b/src/main/resources/assets/extrabees/lang/en_US.lang @@ -127,40 +127,40 @@ extrabees.item.template.corrupted=Corrupted Template extrabees.item.template.name=%s Template extrabees.item.template.empty=Blank Template -extrabees.item.database=Apiarist Database -extrabees.item.masterDatabase=Master Apiarist Database +extrabees.item.database.name=Apiarist Database +extrabees.item.masterDatabase.name=Master Apiarist Database extrabees.item.database.tooltip=Flora-in-a-box -extrabees.item.scentedGear=Scented Gear -extrabees.item.diamondShard=Diamond Fragment -extrabees.item.emeraldShard=Emerald Fragment -extrabees.item.rubyShard=Ruby Fragment -extrabees.item.sapphireShard=Sapphire Fragment -extrabees.item.lapisShard=Lapis Fragment -extrabees.item.ironDust=Iron Grains -extrabees.item.goldDust=Gold Grains -extrabees.item.silverDust=Silver Grains -extrabees.item.platinumDust=Platinum Grains -extrabees.item.copperDust=Copper Grains -extrabees.item.tinDust=Tin Grains -extrabees.item.nickelDust=Nickel Grains -extrabees.item.leadDust=Lead Grains -extrabees.item.zincDust=Zinc Grains -extrabees.item.titaniumDust=Titanium Grains -extrabees.item.tungstenDust=Tungsten Grains -extrabees.item.radioactiveDust=Radioactive Fragments -extrabees.item.coalDust=Coal Grains -extrabees.item.dyeRed=Red Dye -extrabees.item.dyeYellow=Yellow Dye -extrabees.item.dyeBlue=Blue Dye -extrabees.item.dyeGreen=Green Dye -extrabees.item.dyeWhite=White Dye -extrabees.item.dyeBlack=Black Dye -extrabees.item.dyeBrown=Brown Dye -extrabees.item.clayDust=Clay Dust -extrabees.item.yelloriumDust=Yellorium Grains -extrabees.item.blutoniumDust=Blutonium Grains -extrabees.item.cyaniteDust=Cyanite Grains +extrabees.item.scentedGear.name=Scented Gear +extrabees.item.diamondShard.name=Diamond Fragment +extrabees.item.emeraldShard.name=Emerald Fragment +extrabees.item.rubyShard.name=Ruby Fragment +extrabees.item.sapphireShard.name=Sapphire Fragment +extrabees.item.lapisShard.name=Lapis Fragment +extrabees.item.ironDust.name=Iron Grains +extrabees.item.goldDust.name=Gold Grains +extrabees.item.silverDust.name=Silver Grains +extrabees.item.platinumDust.name=Platinum Grains +extrabees.item.copperDust.name=Copper Grains +extrabees.item.tinDust.name=Tin Grains +extrabees.item.nickelDust.name=Nickel Grains +extrabees.item.leadDust.name=Lead Grains +extrabees.item.zincDust.name=Zinc Grains +extrabees.item.titaniumDust.name=Titanium Grains +extrabees.item.tungstenDust.name=Tungsten Grains +extrabees.item.radioactiveDust.name=Radioactive Fragments +extrabees.item.coalDust.name=Coal Grains +extrabees.item.dyeRed.name=Red Dye +extrabees.item.dyeYellow.name=Yellow Dye +extrabees.item.dyeBlue.name=Blue Dye +extrabees.item.dyeGreen.name=Green Dye +extrabees.item.dyeWhite.name=White Dye +extrabees.item.dyeBlack.name=Black Dye +extrabees.item.dyeBrown.name=Brown Dye +extrabees.item.clayDust.name=Clay Dust +extrabees.item.yelloriumDust.name=Yellorium Grains +extrabees.item.blutoniumDust.name=Blutonium Grains +extrabees.item.cyaniteDust.name=Cyanite Grains extrabees.block.apiaristMachine.name=Apiarist Machine extrabees.block.geneticMachine.name=Genetic Machine diff --git a/src/main/resources/assets/extrabees/lang/ru_RU.lang b/src/main/resources/assets/extrabees/lang/ru_RU.lang index be35164e..22c613cb 100644 --- a/src/main/resources/assets/extrabees/lang/ru_RU.lang +++ b/src/main/resources/assets/extrabees/lang/ru_RU.lang @@ -127,40 +127,40 @@ extrabees.item.template.corrupted=повреждённый шаблон extrabees.item.template.name=%s шаблон extrabees.item.template.empty=пустой шаблон -extrabees.item.database=База данных пчеловода -extrabees.item.masterDatabase=База данных пчеловода-мастера +extrabees.item.database.name=База данных пчеловода +extrabees.item.masterDatabase.name=База данных пчеловода-мастера extrabees.item.database.tooltip=Флора-в-коробке -extrabees.item.scentedGear=Ароматная шестерня -extrabees.item.diamondShard=Алмазный осколок -extrabees.item.emeraldShard=Изумрудный осколок -extrabees.item.rubyShard=Рубиновый осколок -extrabees.item.sapphireShard=Сапфировый осколок -extrabees.item.lapisShard=Лазуритовый осколок -extrabees.item.ironDust=Железные гранулы -extrabees.item.goldDust=Золотые гранулы -extrabees.item.silverDust=Серебряные гранулы -extrabees.item.platinumDust=Платиновые гранулы -extrabees.item.copperDust=Медные гранулы -extrabees.item.tinDust=Оловяные гранулы -extrabees.item.nickelDust=Никелевые гранулы -extrabees.item.leadDust=Свинцовые гранулы -extrabees.item.zincDust=Цинковые гранулы -extrabees.item.titaniumDust=Титановые гранулы -extrabees.item.tungstenDust=Вольфрамовые гранулы -extrabees.item.radioactiveDust=Радиоактивные осколки -extrabees.item.coalDust=Угольная пыль -extrabees.item.dyeRed=Красный краситель -extrabees.item.dyeYellow=Желтый краситель -extrabees.item.dyeBlue=Синий краситель -extrabees.item.dyeGreen=Зеленый краситель -extrabees.item.dyeWhite=Белый краситель -extrabees.item.dyeBlack=Чёрный краситель -extrabees.item.dyeBrown=Коричневый краситель -extrabees.item.clayDust=Глиняная пыль -extrabees.item.yelloriumDust=Йеллориумовые гранулы -extrabees.item.blutoniumDust=Блутониевые гранулы -extrabees.item.cyaniteDust=Цианитовые гранулы +extrabees.item.scentedGear.name=Ароматная шестерня +extrabees.item.diamondShard.name=Алмазный осколок +extrabees.item.emeraldShard.name=Изумрудный осколок +extrabees.item.rubyShard.name=Рубиновый осколок +extrabees.item.sapphireShard.name=Сапфировый осколок +extrabees.item.lapisShard.name=Лазуритовый осколок +extrabees.item.ironDust.name=Железные гранулы +extrabees.item.goldDust.name=Золотые гранулы +extrabees.item.silverDust.name=Серебряные гранулы +extrabees.item.platinumDust.name=Платиновые гранулы +extrabees.item.copperDust.name=Медные гранулы +extrabees.item.tinDust.name=Оловяные гранулы +extrabees.item.nickelDust.name=Никелевые гранулы +extrabees.item.leadDust.name=Свинцовые гранулы +extrabees.item.zincDust.name=Цинковые гранулы +extrabees.item.titaniumDust.name=Титановые гранулы +extrabees.item.tungstenDust.name=Вольфрамовые гранулы +extrabees.item.radioactiveDust.name=Радиоактивные осколки +extrabees.item.coalDust.name=Угольная пыль +extrabees.item.dyeRed.name=Красный краситель +extrabees.item.dyeYellow.name=Желтый краситель +extrabees.item.dyeBlue.name=Синий краситель +extrabees.item.dyeGreen.name=Зеленый краситель +extrabees.item.dyeWhite.name=Белый краситель +extrabees.item.dyeBlack.name=Чёрный краситель +extrabees.item.dyeBrown.name=Коричневый краситель +extrabees.item.clayDust.name=Глиняная пыль +extrabees.item.yelloriumDust.name=Йеллориумовые гранулы +extrabees.item.blutoniumDust.name=Блутониевые гранулы +extrabees.item.cyaniteDust.name=Цианитовые гранулы extrabees.block.apiaristMachine.name=Базовый механизм пчеловода extrabees.block.geneticMachine.name=Генетическая машина diff --git a/src/main/resources/assets/extrabees/lang/zh_CN.lang b/src/main/resources/assets/extrabees/lang/zh_CN.lang index 2757bd93..f2752c4b 100644 --- a/src/main/resources/assets/extrabees/lang/zh_CN.lang +++ b/src/main/resources/assets/extrabees/lang/zh_CN.lang @@ -127,40 +127,40 @@ extrabees.item.template.corrupted=脏的模版 extrabees.item.template.name=%s 模版 extrabees.item.template.empty=空白模版 -extrabees.item.database=养蜂员数据库 -extrabees.item.masterDatabase=养蜂大师数据库 +extrabees.item.database.name=养蜂员数据库 +extrabees.item.masterDatabase.name=养蜂大师数据库 extrabees.item.database.tooltip=风光尽在盒中 -extrabees.item.scentedGear=飘香齿轮 -extrabees.item.diamondShard=钻石碎片 -extrabees.item.emeraldShard=绿宝石碎片 -extrabees.item.rubyShard=红宝石碎片 -extrabees.item.sapphireShard=蓝宝石碎片 -extrabees.item.lapisShard=青金石碎片 -extrabees.item.ironDust=铁砂 -extrabees.item.goldDust=金砂 -extrabees.item.silverDust=银砂 -extrabees.item.platinumDust=铂砂 -extrabees.item.copperDust=铜砂 -extrabees.item.tinDust=锡砂 -extrabees.item.nickelDust=镍砂 -extrabees.item.leadDust=铅砂 -extrabees.item.zincDust=锌砂 -extrabees.item.titaniumDust=钛砂 -extrabees.item.tungstenDust=钨砂 -extrabees.item.radioactiveDust=放射性碎片 -extrabees.item.coalDust=煤砂 -extrabees.item.dyeRed=红色颜料 -extrabees.item.dyeYellow=黄色颜料 -extrabees.item.dyeBlue=蓝色颜料 -extrabees.item.dyeGreen=绿色颜料 -extrabees.item.dyeWhite=白色颜料 -extrabees.item.dyeBlack=黑色颜料 -extrabees.item.dyeBrown=棕色颜料 -extrabees.item.clayDust=粘土粉 -extrabees.item.yelloriumDust=黄铀砂 -extrabees.item.blutoniumDust=蓝钚砂 -extrabees.item.cyaniteDust=蓝晶砂 +extrabees.item.scentedGear.name=飘香齿轮 +extrabees.item.diamondShard.name=钻石碎片 +extrabees.item.emeraldShard.name=绿宝石碎片 +extrabees.item.rubyShard.name=红宝石碎片 +extrabees.item.sapphireShard.name=蓝宝石碎片 +extrabees.item.lapisShard.name=青金石碎片 +extrabees.item.ironDust.name=铁砂 +extrabees.item.goldDust.name=金砂 +extrabees.item.silverDust.name=银砂 +extrabees.item.platinumDust.name=铂砂 +extrabees.item.copperDust.name=铜砂 +extrabees.item.tinDust.name=锡砂 +extrabees.item.nickelDust.name=镍砂 +extrabees.item.leadDust.name=铅砂 +extrabees.item.zincDust.name=锌砂 +extrabees.item.titaniumDust.name=钛砂 +extrabees.item.tungstenDust.name=钨砂 +extrabees.item.radioactiveDust.name=放射性碎片 +extrabees.item.coalDust.name=煤砂 +extrabees.item.dyeRed.name=红色颜料 +extrabees.item.dyeYellow.name=黄色颜料 +extrabees.item.dyeBlue.name=蓝色颜料 +extrabees.item.dyeGreen.name=绿色颜料 +extrabees.item.dyeWhite.name=白色颜料 +extrabees.item.dyeBlack.name=黑色颜料 +extrabees.item.dyeBrown.name=棕色颜料 +extrabees.item.clayDust.name=粘土粉 +extrabees.item.yelloriumDust.name=黄铀砂 +extrabees.item.blutoniumDust.name=蓝钚砂 +extrabees.item.cyaniteDust.name=蓝晶砂 extrabees.block.apiaristMachine.name=养蜂员机器方块 extrabees.block.geneticMachine.name=基因机器方块