upstream/Binnie
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Binnie.git synced 2026-11-14 01:14:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move comb items

Browse Source
This commit is contained in:
ah-OOG-ah committed 2024-09-29 19:14:10 -04:00
1 parent fe53e964c1
commit e0b90f69e0
10 files changed
+660 -710
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/binnie/core/item/DamageItems.java
+9 -8
View File
@@ -18,17 +18,19 @@ public abstract class DamageItems extends Item {
private final String[] NAMES;
private final IIcon[] ICONS;
private final String modid;
private final boolean overrideIcons;
protected DamageItems(CreativeTabs tab, String modid, String... names) {
this(tab, modid, "misc", names);
this(tab, modid, "misc", false, names);
}
protected DamageItems(CreativeTabs tab, String modid, String name, String... names) {
protected DamageItems(CreativeTabs tab, String modid, String name, boolean overrideIcons, String... names) {
setCreativeTab(tab);
setHasSubtypes(true);
setUnlocalizedName(name);
this.overrideIcons = overrideIcons;
NAMES = names;
ICONS = new IIcon[names.length];
ICONS = overrideIcons ? null : new IIcon[names.length];
this.modid = modid;
GameRegistry.registerItem(this, name);
}
@@ -60,12 +62,9 @@ public abstract class DamageItems extends Item {
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return getIconFromDamage(stack.getItemDamage());
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int damage) {
if (overrideIcons) return null;
return (damage < ICONS.length && damage >= 0) ? ICONS[damage] : null;
}
@@ -76,6 +75,8 @@ public abstract class DamageItems extends Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
if (overrideIcons) return;
for (int i = 0; i < NAMES.length; ++i) {
ICONS[i] = register.registerIcon(modid + ":" + getIconName(i));
}
src/main/java/binnie/extrabees/ExtraBees.java
+16 -8
View File
@@ -1,13 +1,5 @@
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 com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.Tags;
@@ -20,14 +12,23 @@ import binnie.extrabees.core.ExtraBeeGUID;
import binnie.extrabees.core.ModuleCore;
import binnie.extrabees.genetics.ModuleGenetics;
import binnie.extrabees.liquids.ModuleLiquids;
import binnie.extrabees.products.CombItems;
import binnie.extrabees.products.ModuleProducts;
import binnie.extrabees.proxy.ExtraBeesProxy;
import binnie.extrabees.worldgen.ModuleGeneration;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.init.Items;
import net.minecraftforge.oredict.OreDictionary;
@Mod(
modid = ExtraBees.EB_MODID,
@@ -78,6 +79,13 @@ public class ExtraBees extends AbstractMod {
@Mod.EventHandler
public void init(FMLInitializationEvent event) {
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
OreDictionary.registerOre("gemEmerald", Items.emerald);
CombItems.addSubtypes();
init();
}
src/main/java/binnie/extrabees/genetics/ExtraBeeDefinition.java
+153 -156
View File
@@ -1,21 +1,9 @@
package binnie.extrabees.genetics;
import java.awt.Color;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Locale;
import java.util.Map;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.BiomeDictionary;
import binnie.core.Mods;
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
import binnie.extrabees.genetics.requirements.RequirementPerson;
import binnie.extrabees.products.EnumHoneyComb;
import binnie.extrabees.products.ItemHoneyComb;
import binnie.extrabees.products.CombItems;
import binnie.genetics.genetics.AlleleHelper;
import forestry.api.apiculture.BeeManager;
import forestry.api.apiculture.EnumBeeChromosome;
@@ -34,6 +22,15 @@ import forestry.apiculture.genetics.IBeeDefinition;
import forestry.apiculture.genetics.alleles.AlleleEffect;
import forestry.core.genetics.IBranchDefinition;
import forestry.core.genetics.alleles.EnumAllele;
import java.awt.Color;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.Locale;
import java.util.Map;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.BiomeDictionary;
public enum ExtraBeeDefinition implements IBeeDefinition {
@@ -42,7 +39,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -61,7 +58,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -74,7 +71,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID).setHasEffect();
}
@@ -94,7 +91,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.COMPOST.get(1), 0.08f)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).addSpecialty(CombItems.Items.COMPOST.get(1), 0.08f)
.setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID);
}
@@ -107,7 +104,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.25f).addSpecialty(EnumHoneyComb.SAWDUST.get(1), 0.25f)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.25f).addSpecialty(CombItems.Items.SAWDUST.get(1), 0.25f)
.setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID);
}
@@ -130,7 +127,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.ROTTEN.get(1), 0.10f)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).addSpecialty(CombItems.Items.ROTTEN.get(1), 0.10f)
.setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID);
}
@@ -151,7 +148,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f).addSpecialty(EnumHoneyComb.BONE.get(1), 0.10f)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f).addSpecialty(CombItems.Items.BONE.get(1), 0.10f)
.setTemperature(EnumTemperature.HOT).setHumidity(EnumHumidity.ARID);
}
@@ -172,8 +169,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.30f)
.addSpecialty(ItemHoneyComb.VanillaComb.POWDERY.get(), 0.08f).setTemperature(EnumTemperature.HOT)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.30f)
.addSpecialty(CombItems.ForestryCombs.POWDERY.get(), 0.08f).setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -196,14 +193,14 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.30f);
}
},
STONE(ExtraBeeBranchDefinition.ROCKY, "lapis", false, new Color(0x757575), new Color(0x999999)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.30f);
}
@Override
@@ -215,7 +212,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.30f);
}
@Override
@@ -233,7 +230,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.30f);
}
@Override
@@ -253,7 +250,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.COPPER.get(1), 0.06f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.COPPER.get(1), 0.06f);
}
@Override
@@ -266,7 +263,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TIN.get(1), 0.06f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.TIN.get(1), 0.06f);
}
@Override
@@ -279,7 +276,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.IRON.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.IRON.get(1), 0.05f);
}
@Override
@@ -292,7 +289,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.LEAD.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.LEAD.get(1), 0.05f);
}
@Override
@@ -307,7 +304,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.ZINC.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.ZINC.get(1), 0.05f);
}
@Override
@@ -320,7 +317,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TITANIUM.get(1), 0.02f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.TITANIUM.get(1), 0.02f);
}
@Override
@@ -332,7 +329,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.TUNGSTEN.get(1), 0.01f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.TUNGSTEN.get(1), 0.01f);
}
@Override
@@ -344,7 +341,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.NICKEL.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.NICKEL.get(1), 0.05f);
}
@Override
@@ -359,7 +356,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.GOLD.get(1), 0.02f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.GOLD.get(1), 0.02f);
}
@Override
@@ -374,7 +371,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.SILVER.get(1), 0.02f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.SILVER.get(1), 0.02f);
}
@Override
@@ -390,7 +387,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.PLATINUM.get(1), 0.01f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.PLATINUM.get(1), 0.01f);
}
@Override
@@ -404,7 +401,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.LAPIS.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.LAPIS.get(1), 0.05f);
}
@Override
@@ -423,7 +420,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.EMERALD.get(1), 0.04f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.EMERALD.get(1), 0.04f);
}
@Override
@@ -435,7 +432,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.RUBY.get(1), 0.03f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.RUBY.get(1), 0.03f);
}
@Override
@@ -447,7 +444,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.SAPPHIRE.get(1), 0.03f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.SAPPHIRE.get(1), 0.03f);
}
@Override
@@ -460,7 +457,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.STONE.get(1), 0.20f).addSpecialty(EnumHoneyComb.DIAMOND.get(1), 0.01f);
beeSpecies.addProduct(CombItems.Items.STONE.get(1), 0.20f).addSpecialty(CombItems.Items.DIAMOND.get(1), 0.01f);
}
@Override
@@ -474,7 +471,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f);
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f);
}
@Override
@@ -486,7 +483,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f);
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f);
}
@Override
@@ -503,7 +500,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f).addSpecialty(EnumHoneyComb.URANIUM.get(1), 0.02f)
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f).addSpecialty(CombItems.Items.URANIUM.get(1), 0.02f)
.setHasEffect();
}
@@ -517,8 +514,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f)
.addSpecialty(EnumHoneyComb.YELLORIUM.get(1), 0.02f);
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f)
.addSpecialty(CombItems.Items.YELLORIUM.get(1), 0.02f);
}
@Override
@@ -540,7 +537,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f).addSpecialty(EnumHoneyComb.CYANITE.get(1), 0.01f);
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f).addSpecialty(CombItems.Items.CYANITE.get(1), 0.01f);
}
@Override
@@ -562,8 +559,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.BARREN.get(1), 0.20f)
.addSpecialty(EnumHoneyComb.BLUTONIUM.get(1), 0.01f);
beeSpecies.addProduct(CombItems.Items.BARREN.get(1), 0.20f)
.addSpecialty(CombItems.Items.BLUTONIUM.get(1), 0.01f);
}
@Override
@@ -587,7 +584,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.30f);
}
@Override
@@ -599,7 +596,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.30f);
}
@Override
@@ -616,7 +613,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.30f);
}
@Override
@@ -634,7 +631,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.30f).setHasEffect();
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.30f).setHasEffect();
}
@Override
@@ -653,7 +650,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.COAL.get(1), 0.08f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.20f).addSpecialty(CombItems.Items.COAL.get(1), 0.08f);
}
@Override
@@ -666,7 +663,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.RESIN.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.20f).addSpecialty(CombItems.Items.RESIN.get(1), 0.05f);
}
@Override
@@ -678,7 +675,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.20f).addSpecialty(EnumHoneyComb.OIL.get(1), 0.05f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.20f).addSpecialty(CombItems.Items.OIL.get(1), 0.05f);
}
@Override
@@ -694,7 +691,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OLD.get(1), 0.10f);
beeSpecies.addProduct(CombItems.Items.OLD.get(1), 0.10f);
}
@Override
@@ -706,7 +703,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.OIL.get(1), 0.10f).addSpecialty(EnumHoneyComb.FUEL.get(1), 0.04f)
beeSpecies.addProduct(CombItems.Items.OIL.get(1), 0.10f).addSpecialty(CombItems.Items.FUEL.get(1), 0.04f)
.setHasEffect();
}
@@ -719,7 +716,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.COAL.get(1), 0.10f).addSpecialty(EnumHoneyComb.CREOSOTE.get(1), 0.07f)
beeSpecies.addProduct(CombItems.Items.COAL.get(1), 0.10f).addSpecialty(CombItems.Items.CREOSOTE.get(1), 0.07f)
.setHasEffect();
}
@@ -732,7 +729,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.RESIN.get(1), 0.10f).addSpecialty(EnumHoneyComb.LATEX.get(1), 0.05f)
beeSpecies.addProduct(CombItems.Items.RESIN.get(1), 0.10f).addSpecialty(CombItems.Items.LATEX.get(1), 0.05f)
.setHasEffect();
}
@@ -747,14 +744,14 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP);
beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP);
}
},
RIVER(ExtraBeeBranchDefinition.AQUATIC, "flumen", true, new Color(0x83b3d4), new Color(0xffdc16)) {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).addSpecialty(EnumHoneyComb.CLAY.get(1), 0.20f)
beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f).addSpecialty(CombItems.Items.CLAY.get(1), 0.20f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -767,7 +764,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP);
beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f).setHumidity(EnumHumidity.DAMP);
}
@Override
@@ -779,7 +776,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.WATER.get(1), 0.30f).addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f)
beeSpecies.addProduct(CombItems.Items.WATER.get(1), 0.30f).addSpecialty(new ItemStack(Items.dye, 1, 0), 0.10f)
.setHumidity(EnumHumidity.DAMP);
}
@@ -794,7 +791,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.35f);
}
@Override
@@ -816,8 +813,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f)
.addSpecialty(EnumHoneyComb.SEED.get(1), 0.10f);
beeSpecies.addProduct(CombItems.ForestryCombs.WHEATEN.get(), 0.30f)
.addSpecialty(CombItems.Items.SEED.get(1), 0.10f);
}
@Override
@@ -829,7 +826,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.35f);
}
@Override
@@ -851,7 +848,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.35f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.35f);
}
@Override
@@ -879,7 +876,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f)
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.40f)
.addProduct(new ItemStack(Items.sugar, 1, 0), 0.10f);
}
@@ -892,7 +889,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.40f)
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.40f)
.addProduct(new ItemStack(Items.sugar, 1, 0), 0.20f);
}
@@ -905,9 +902,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f)
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.30f)
.addProduct(new ItemStack(Items.sugar, 1, 0), 0.10f)
.addSpecialty(EnumHoneyComb.FRUIT.get(1), 0.10f);
.addSpecialty(CombItems.Items.FRUIT.get(1), 0.10f);
}
@Override
@@ -927,8 +924,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f)
.addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f).addSpecialty(EnumHoneyComb.FRUIT.get(1), 0.20f)
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.30f)
.addProduct(new ItemStack(Items.sugar, 1, 0), 0.15f).addSpecialty(CombItems.Items.FRUIT.get(1), 0.20f)
.setHasEffect();
}
@@ -951,8 +948,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f)
.addSpecialty(EnumHoneyComb.ALCOHOL.get(1), 0.10f);
beeSpecies.addProduct(CombItems.ForestryCombs.WHEATEN.get(), 0.30f)
.addSpecialty(CombItems.Items.ALCOHOL.get(1), 0.10f);
}
@Override
@@ -970,8 +967,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f)
.addSpecialty(EnumHoneyComb.MILK.get(1), 0.10f);
beeSpecies.addProduct(CombItems.ForestryCombs.WHEATEN.get(), 0.30f)
.addSpecialty(CombItems.Items.MILK.get(1), 0.10f);
}
@Override
@@ -983,8 +980,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.WHEATEN.get(), 0.30f)
.addSpecialty(EnumHoneyComb.COFFEE.get(1), 0.08f);
beeSpecies.addProduct(CombItems.ForestryCombs.WHEATEN.get(), 0.30f)
.addSpecialty(CombItems.Items.COFFEE.get(1), 0.08f);
}
@Override
@@ -1000,7 +997,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f).setHumidity(EnumHumidity.DAMP);
beeSpecies.addProduct(CombItems.ForestryCombs.MOSSY.get(), 0.30f).setHumidity(EnumHumidity.DAMP);
}
@Override
@@ -1018,7 +1015,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f);
beeSpecies.addProduct(CombItems.ForestryCombs.MOSSY.get(), 0.30f);
}
@Override
@@ -1036,8 +1033,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.MOSSY.get(), 0.30f)
.addSpecialty(EnumHoneyComb.FUNGAL.get(1), 0.15f).setHasEffect();
beeSpecies.addProduct(CombItems.ForestryCombs.MOSSY.get(), 0.30f)
.addSpecialty(CombItems.Items.FUNGAL.get(1), 0.15f).setHasEffect();
}
@Override
@@ -1066,7 +1063,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f)
beeSpecies.addProduct(CombItems.ForestryCombs.SIMMERING.get(), 0.25f)
.setTemperature(EnumTemperature.HELLISH).setHumidity(EnumHumidity.ARID);
}
@@ -1079,7 +1076,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f)
beeSpecies.addProduct(CombItems.ForestryCombs.SIMMERING.get(), 0.25f)
.setTemperature(EnumTemperature.HELLISH).setHumidity(EnumHumidity.ARID);
}
@@ -1094,8 +1091,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SIMMERING.get(), 0.25f)
.addSpecialty(EnumHoneyComb.BLAZE.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH)
beeSpecies.addProduct(CombItems.ForestryCombs.SIMMERING.get(), 0.25f)
.addSpecialty(CombItems.Items.BLAZE.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID).setHasEffect();
}
@@ -1109,7 +1106,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.GLOWSTONE.get(1), 0.15f).setTemperature(EnumTemperature.HELLISH)
beeSpecies.addProduct(CombItems.Items.GLOWSTONE.get(1), 0.15f).setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
}
@@ -1129,7 +1126,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM);
}
@@ -1142,7 +1139,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f);
}
@Override
@@ -1159,8 +1156,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f)
.addSpecialty(EnumHoneyComb.VENOMOUS.get(1), 0.12f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f)
.addSpecialty(CombItems.Items.VENOMOUS.get(1), 0.12f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM).setHasEffect();
}
@@ -1180,7 +1177,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM);
}
@@ -1193,7 +1190,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM);
}
@@ -1211,8 +1208,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f)
.addSpecialty(EnumHoneyComb.SLIME.get(1), 0.12f).setHasEffect();
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f)
.addSpecialty(CombItems.Items.SLIME.get(1), 0.12f).setHasEffect();
}
@Override
@@ -1231,7 +1228,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.20f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM);
}
@@ -1244,8 +1241,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.25f)
.addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.03f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.25f)
.addSpecialty(CombItems.Items.ACIDIC.get(1), 0.03f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM);
}
@@ -1258,8 +1255,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.SILKY.get(), 0.20f)
.addSpecialty(EnumHoneyComb.ACIDIC.get(1), 0.16f).setHumidity(EnumHumidity.DAMP)
beeSpecies.addProduct(CombItems.ForestryCombs.SILKY.get(), 0.20f)
.addSpecialty(CombItems.Items.ACIDIC.get(1), 0.16f).setHumidity(EnumHumidity.DAMP)
.setTemperature(EnumTemperature.WARM).setHasEffect();
}
@@ -1274,7 +1271,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.10f);
beeSpecies.addProduct(CombItems.Items.REDSTONE.get(1), 0.10f);
}
@Override
@@ -1286,7 +1283,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.12f);
beeSpecies.addProduct(CombItems.Items.REDSTONE.get(1), 0.12f);
}
@Override
@@ -1298,8 +1295,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.REDSTONE.get(1), 0.20f)
.addSpecialty(EnumHoneyComb.IC2ENERGY.get(1), 0.08f).setHasEffect();
beeSpecies.addProduct(CombItems.Items.REDSTONE.get(1), 0.20f)
.addSpecialty(CombItems.Items.IC2ENERGY.get(1), 0.08f).setHasEffect();
}
@Override
@@ -1319,7 +1316,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.25f).setTemperature(EnumTemperature.ICY);
beeSpecies.addProduct(CombItems.ForestryCombs.FROZEN.get(), 0.25f).setTemperature(EnumTemperature.ICY);
}
@Override
@@ -1338,8 +1335,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.FROZEN.get(), 0.20f)
.addSpecialty(EnumHoneyComb.GLACIAL.get(1), 0.10f).setTemperature(EnumTemperature.ICY);
beeSpecies.addProduct(CombItems.ForestryCombs.FROZEN.get(), 0.20f)
.addSpecialty(CombItems.Items.GLACIAL.get(1), 0.10f).setTemperature(EnumTemperature.ICY);
}
@Override
@@ -1360,7 +1357,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.05f).setTemperature(EnumTemperature.HELLISH)
beeSpecies.addProduct(CombItems.Items.SHADOW.get(1), 0.05f).setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
}
@@ -1373,7 +1370,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH)
beeSpecies.addProduct(CombItems.Items.SHADOW.get(1), 0.10f).setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID);
}
@@ -1386,7 +1383,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.SHADOW.get(1), 0.25f).setTemperature(EnumTemperature.HELLISH)
beeSpecies.addProduct(CombItems.Items.SHADOW.get(1), 0.25f).setTemperature(EnumTemperature.HELLISH)
.setHumidity(EnumHumidity.ARID).setHasEffect();
}
@@ -1407,8 +1404,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.RED.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.RED.get(1), 0.25f);
}
@Override
@@ -1420,8 +1417,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.YELLOW.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.YELLOW.get(1), 0.25f);
}
@Override
@@ -1433,8 +1430,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.BLUE.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.BLUE.get(1), 0.25f);
}
@Override
@@ -1446,8 +1443,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.GREEN.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.GREEN.get(1), 0.25f);
}
@Override
@@ -1459,8 +1456,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.BLACK.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.BLACK.get(1), 0.25f);
}
@Override
@@ -1472,8 +1469,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.WHITE.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.WHITE.get(1), 0.25f);
}
@Override
@@ -1485,8 +1482,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.BROWN.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.BROWN.get(1), 0.25f);
}
@Override
@@ -1500,8 +1497,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.ORANGE.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.ORANGE.get(1), 0.25f);
}
@Override
@@ -1513,8 +1510,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.CYAN.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.CYAN.get(1), 0.25f);
}
@Override
@@ -1526,8 +1523,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.PURPLE.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.PURPLE.get(1), 0.25f);
}
@Override
@@ -1539,8 +1536,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.GRAY.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.GRAY.get(1), 0.25f);
}
@Override
@@ -1552,8 +1549,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.LIGHTBLUE.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.LIGHTBLUE.get(1), 0.25f);
}
@Override
@@ -1565,8 +1562,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.PINK.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.PINK.get(1), 0.25f);
}
@Override
@@ -1578,8 +1575,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.LIMEGREEN.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.LIMEGREEN.get(1), 0.25f);
}
@Override
@@ -1593,8 +1590,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.MAGENTA.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.MAGENTA.get(1), 0.25f);
}
@Override
@@ -1606,8 +1603,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.75f)
.addSpecialty(EnumHoneyComb.LIGHTGRAY.get(1), 0.25f);
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.75f)
.addSpecialty(CombItems.Items.LIGHTGRAY.get(1), 0.25f);
}
@Override
@@ -1644,8 +1641,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.HONEY.get(), 0.30f)
.addSpecialty(Mods.forestry.stack("pollen"), 0.20f).addSpecialty(EnumHoneyComb.PURPLE.get(1), 0.15f)
beeSpecies.addProduct(CombItems.ForestryCombs.HONEY.get(), 0.30f)
.addSpecialty(Mods.forestry.stack("pollen"), 0.20f).addSpecialty(CombItems.Items.PURPLE.get(1), 0.15f)
.setIsNotCounted().setHasEffect();
}
@@ -1660,7 +1657,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(new ItemStack(Items.cake, 1), 1f)
.addSpecialty(Mods.forestry.stack("pollenFertile"), 0.50f)
.addSpecialty(EnumHoneyComb.MILK.get(1), 0.55f).setIsNotCounted().setHasEffect();
.addSpecialty(CombItems.Items.MILK.get(1), 0.55f).setIsNotCounted().setHasEffect();
}
protected void setAlleles(IAllele[] template) {
@@ -1722,7 +1719,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(EnumHoneyComb.SALTPETER.get(1), 0.12f).setTemperature(EnumTemperature.HOT)
beeSpecies.addProduct(CombItems.Items.SALTPETER.get(1), 0.12f).setTemperature(EnumTemperature.HOT)
.setHumidity(EnumHumidity.ARID);
}
@@ -1751,9 +1748,9 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f)
.addSpecialty(EnumHoneyComb.CERTUS.get(1), 0.15f)
.addSpecialty(EnumHoneyComb.ENDERPEARL.get(1), 0.15f);
beeSpecies.addProduct(CombItems.ForestryCombs.QUARTZ.get(), 0.25f)
.addSpecialty(CombItems.Items.CERTUS.get(1), 0.15f)
.addSpecialty(CombItems.Items.ENDERPEARL.get(1), 0.15f);
}
@Override
@@ -1777,7 +1774,7 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f).setTemperature(EnumTemperature.COLD);
beeSpecies.addProduct(CombItems.ForestryCombs.QUARTZ.get(), 0.25f).setTemperature(EnumTemperature.COLD);
}
@Override
@@ -1789,8 +1786,8 @@ public enum ExtraBeeDefinition implements IBeeDefinition {
@Override
protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
beeSpecies.addProduct(ItemHoneyComb.VanillaComb.QUARTZ.get(), 0.25f)
.addSpecialty(EnumHoneyComb.CERTUS.get(1), 0.05f).setTemperature(EnumTemperature.COLD);
beeSpecies.addProduct(CombItems.ForestryCombs.QUARTZ.get(), 0.25f)
.addSpecialty(CombItems.Items.CERTUS.get(1), 0.05f).setTemperature(EnumTemperature.COLD);
}
@Override
src/main/java/binnie/extrabees/item/EBItems.java
+2 -2
View File
@@ -2,14 +2,14 @@ package binnie.extrabees.item;
import binnie.core.item.DamageItems;
import binnie.extrabees.genetics.items.ItemDictionary;
import binnie.extrabees.products.ItemHoneyComb;
import binnie.extrabees.products.CombItems;
import binnie.extrabees.products.ItemHoneyDrop;
import binnie.extrabees.products.Propolis;
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 DamageItems comb = new CombItems();
public final static Propolis propolis = new Propolis();
public final static Item honeyDrop = new ItemHoneyDrop();
public static Item dictionary = new ItemDictionary();
src/main/java/binnie/extrabees/item/EBMisc.java
+19
View File
@@ -53,6 +53,7 @@ public class EBMisc extends DamageItems {
final String resourceString;
final boolean isMetal;
private static final Items[] VALUES = values();
private static final int[] binnieToVanillaColors = { 1, 11, 4, 2, 0, 15, 3, 14, 6, 5, 8, 12, 9, 10, 13, 7 };
Items(String name) {
this(name, null, false);
@@ -67,6 +68,24 @@ public class EBMisc extends DamageItems {
public ItemStack get(int count) {
return itemMisc.getStack(count, ordinal());
}
/**
* @param binnieID The index of colors used by Binnie's mods, starting with red = 0
* @return An itemstack containing one dye item, preferring Binnie's when possible
*/
public static ItemStack getDye(int binnieID) {
final int i = binnieToVanillaColors[binnieID];
return switch (i) {
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(net.minecraft.init.Items.dye, 1, i);
};
}
}
protected EBMisc() {
src/main/java/binnie/extrabees/products/CombItems.java
+441
View File
@@ -0,0 +1,441 @@
package binnie.extrabees.products;
import static binnie.extrabees.ExtraBees.EB_MODID;
import static binnie.extrabees.item.EBItems.comb;
import static binnie.extrabees.item.EBMisc.Items.BlutoniumDust;
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.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.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.YelloriumDust;
import static binnie.extrabees.item.EBMisc.Items.ZincDust;
import static net.minecraft.init.Items.dye;
import binnie.core.Mods;
import binnie.core.item.DamageItems;
import binnie.extrabees.item.EBItems;
import binnie.extrabees.item.EBMisc;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
import forestry.api.recipes.RecipeManagers;
import it.unimi.dsi.fastutil.objects.Object2FloatOpenHashMap;
import java.awt.Color;
import java.util.Arrays;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.oredict.OreDictionary;
public class CombItems extends DamageItems {
public enum Items {
BARREN("barren", new Color(0x736c44), new Color(0xc2bea7)),
ROTTEN("rotten", new Color(0x3e5221), new Color(0xb1cc89)),
BONE("bone", new Color(0xc4c4af), new Color(0xdedec1)),
OIL("oil", new Color(0x060608), new Color(0x2c2b36)),
COAL("coal", new Color(0x9e9478), new Color(0x38311e)),
FUEL("fuel", new Color(0x9c6f40), new Color(0xffc400)),
WATER("water", new Color(0x2732cf), new Color(0x79a8c9)),
MILK("milk", new Color(0xd7d9c7), new Color(0xffffff)),
FRUIT("fruit", new Color(0x7d2934), new Color(0xdb4f62)),
SEED("seed", new Color(0x344f33), new Color(0x71cc6e)),
ALCOHOL("alcohol", new Color(0x418521), new Color(0xded94e)),
STONE("stone", new Color(0x8c8c91), new Color(0xc6c6cc)),
REDSTONE("redstone", new Color(0xfa9696), new Color(0xe61010)),
RESIN("resin", new Color(0xffc74f), new Color(0xc98a00)),
IC2ENERGY("energy", new Color(0xe9f50f), new Color(0x20b3c9)),
IRON("iron", new Color(0x363534), new Color(0xa87058)),
GOLD("gold", new Color(0x363534), new Color(0xe6cc0b)),
COPPER("copper", new Color(0x363534), new Color(0xd16308)),
TIN("tin", new Color(0x363534), new Color(0xbdb1bd)),
SILVER("silver", new Color(0x363534), new Color(0xdbdbdb)),
URANIUM("uranium", new Color(0x1eff00), new Color(0x41ab33)),
CLAY("clay", new Color(0x6b563a), new Color(0xb0c0d6)),
OLD("old", new Color(0x453314), new Color(0xb39664)),
FUNGAL("fungal", new Color(0x6e654b), new Color(0x2b9443)),
CREOSOTE("creosote", new Color(0x9c810c), new Color(0xbdaa57)),
LATEX("latex", new Color(0x595541), new Color(0xa8a285)),
ACIDIC("acidic", new Color(0x348543), new Color(0x14f73e)),
VENOMOUS("venomous", new Color(0x7d187d), new Color(0xff33ff)),
SLIME("slime", new Color(0x3b473c), new Color(0x80d185)),
BLAZE("blaze", new Color(0xff6a00), new Color(0xffcc00)),
COFFEE("coffee", new Color(0x54381d), new Color(0xb37f4b)),
GLACIAL("glacial", new Color(0x4e8787), new Color(0xcbf2f2)),
SHADOW("shadow", new Color(0x000000), new Color(0x361835)),
LEAD("lead", new Color(0x363534), new Color(0x9a809c)),
ZINC("zinc", new Color(0x363534), new Color(0xedebff)),
TITANIUM("titanium", new Color(0x363534), new Color(0xb0aae3)),
TUNGSTEN("tungsten", new Color(0x363534), new Color(0x131214)),
PLATINUM("platinum", new Color(0x363534), new Color(0x9a809c)),
LAPIS("lapis", new Color(0x363534), new Color(0x3d2cdb)),
EMERALD("emerald", new Color(0x363534), new Color(0x1cff03)),
RUBY("ruby", new Color(0x363534), new Color(0xd60000)),
SAPPHIRE("sapphire", new Color(0x363534), new Color(0xa47ff)),
DIAMOND("diamond", new Color(0x363534), new Color(0x7fbdfa)),
RED("red", new Color(0xcc4c4c), new Color(0xff0000)),
YELLOW("yellow", new Color(0xe5e533), new Color(0xffdd00)),
BLUE("blue", new Color(0x99b2f2), new Color(0x0022ff)),
GREEN("green", new Color(0x667f33), new Color(0x009900)),
BLACK("black", new Color(0x191919), new Color(0x575757)),
WHITE("white", new Color(0xd6d6d6), new Color(0xffffff)),
BROWN("brown", new Color(0x7f664c), new Color(0x5c350f)),
ORANGE("orange", new Color(0xf2b233), new Color(0xff9d00)),
CYAN("cyan", new Color(0x4c99b2), new Color(0x00ffe5)),
PURPLE("purple", new Color(0xb266e5), new Color(0xae00ff)),
GRAY("gray", new Color(0x4c4c4c), new Color(0xbababa)),
LIGHTBLUE("lightblue", new Color(0x99b2f2), new Color(0x009dff)),
PINK("pink", new Color(0xf2b2cc), new Color(0xff80df)),
LIMEGREEN("limegreen", new Color(0x7fcc19), new Color(0x00ff08)),
MAGENTA("magenta", new Color(0xe57fd8), new Color(0xff00cc)),
LIGHTGRAY("lightgray", new Color(0x999999), new Color(0xc9c9c9)),
NICKEL("nickel", new Color(0x363534), new Color(0xffdefc)),
GLOWSTONE("glowstone", new Color(0xa69c5e), new Color(0xe0c409)),
SALTPETER("saltpeter", new Color(0xa69c5e), new Color(0xe0c409)),
COMPOST("compost", new Color(0x423308), new Color(0x6b5e3b)),
SAWDUST("sawdust", new Color(0xbfaa71), new Color(0xf2d37e)),
CERTUS("certus", new Color(0xc6d0ff), new Color(0x394d63)),
ENDERPEARL("enderpearl", new Color(0x349786), new Color(0x32620)),
YELLORIUM("yellorium", new Color(0x27204d), new Color(14019840)),
CYANITE("cyanite", new Color(0x27204d), new Color(0x86ed)),
BLUTONIUM("blutonium", new Color(0x27204d), new Color(0x1b00e6));
final String name;
final int primary;
final int secondary;
final Object2FloatOpenHashMap<ItemStack> products = new Object2FloatOpenHashMap<>();
public static final Items[] VALUES = values();
Items(String name, Color primary, Color secondary) {
this.name = name;
this.primary = primary.getRGB();
this.secondary = secondary.getRGB();
}
public ItemStack get(int count) {
return comb.getStack(count, ordinal());
}
public void addRecipe() {
RecipeManagers.centrifugeManager.addRecipe(20, get(1), products);
}
public void addProduct(ItemStack item, float chance) {
if (item == null) return;
products.put(item.copy(), chance);
}
public void copyProducts(Items comb) {
products.putAll(comb.products);
}
}
public enum ForestryCombs {
HONEY,
COCOA,
SIMMERING,
STRINGY,
FROZEN,
DRIPPING,
SILKY,
PARCHED,
MYSTERIOUS,
IRRADIATED,
POWDERY,
REDDENED,
DARKENED,
OMEGA,
WHEATEN,
MOSSY,
QUARTZ;
public ItemStack get() {
return new ItemStack(Mods.forestry.item("beeCombs"), 1, ordinal());
}
}
private IIcon cells;
private IIcon outline;
public CombItems() {
super(
Tabs.tabApiculture,
EB_MODID,
"honeyComb",
true,
Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new));
setMaxStackSize(64);
setMaxDamage(0);
}
@Override
public String getUnlocalizedName(String name) {
return "extrabees.item.comb." + name;
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public int getColorFromItemStack(ItemStack stack, int indexColor) {
final int damage = stack.getItemDamage();
final Items comb = damage < Items.VALUES.length ? Items.VALUES[stack.getItemDamage()] : null;
if (comb == null) return 0xffffff;
return indexColor == 0 ? comb.primary : comb.secondary;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int damage, int pass) {
return pass > 0 ? cells : outline;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
cells = register.registerIcon("forestry:beeCombs.0");
outline = register.registerIcon("forestry:beeCombs.1");
}
public static void addSubtypes() {
final ItemStack beeswax = Mods.forestry.stack("beeswax");
final ItemStack honeyDrop = Mods.forestry.stack("honeyDrop");
OreDictionary.registerOre("gemLapis", new ItemStack(dye, 1, 4));
Items.BARREN.addProduct(beeswax, 1.00f);
Items.BARREN.addProduct(honeyDrop, 0.50f);
Items.ROTTEN.addProduct(beeswax, 0.20f);
Items.ROTTEN.addProduct(honeyDrop, 0.20f);
Items.ROTTEN.addProduct(new ItemStack(net.minecraft.init.Items.rotten_flesh, 1, 0), 0.80f);
Items.BONE.addProduct(beeswax, 0.20f);
Items.BONE.addProduct(honeyDrop, 0.20f);
Items.BONE.addProduct(new ItemStack(dye, 1, 15), 0.80f);
Items.OIL.addProduct(Propolis.Items.OIL.get(1), 0.60f);
Items.OIL.addProduct(honeyDrop, 0.75f);
Items.COAL.addProduct(beeswax, 0.80f);
Items.COAL.addProduct(honeyDrop, 0.75f);
Items.COAL.addProduct(CoalDust.get(1), 1.00f);
Items.WATER.addProduct(Propolis.Items.WATER.get(1), 1.00f);
Items.WATER.addProduct(honeyDrop, 0.90f);
Items.STONE.addProduct(beeswax, 0.50f);
Items.STONE.addProduct(honeyDrop, 0.25f);
Items.MILK.addProduct(EnumHoneyDrop.MILK.get(1), 1.00f);
Items.MILK.addProduct(honeyDrop, 0.90f);
Items.FRUIT.addProduct(EnumHoneyDrop.APPLE.get(1), 1.00f);
Items.FRUIT.addProduct(honeyDrop, 0.90f);
Items.SEED.addProduct(EnumHoneyDrop.SEED.get(1), 1.00f);
Items.SEED.addProduct(honeyDrop, 0.90f);
Items.ALCOHOL.addProduct(EnumHoneyDrop.ALCOHOL.get(1), 1.00f);
Items.ALCOHOL.addProduct(honeyDrop, 0.90f);
Items.FUEL.addProduct(Propolis.Items.FUEL.get(1), 0.60f);
Items.FUEL.addProduct(honeyDrop, 0.50f);
Items.CREOSOTE.addProduct(Propolis.Items.CREOSOTE.get(1), 0.70f);
Items.CREOSOTE.addProduct(honeyDrop, 0.50f);
Items.LATEX.addProduct(honeyDrop, 0.50f);
Items.LATEX.addProduct(beeswax, 0.85f);
if (!OreDictionary.getOres("itemRubber").isEmpty()) {
Items.LATEX.addProduct(OreDictionary.getOres("itemRubber").get(0), 1.00f);
}
Items.REDSTONE.addProduct(beeswax, 0.80f);
Items.REDSTONE.addProduct(new ItemStack(net.minecraft.init.Items.redstone, 1, 0), 1.00f);
Items.REDSTONE.addProduct(honeyDrop, 0.50f);
Items.RESIN.addProduct(beeswax, 1.00f);
Items.RESIN.addProduct(Mods.ic2.stack("itemHarz"), 1.00f);
Items.RESIN.addProduct(Mods.ic2.stack("itemHarz"), 0.50f);
Items.IC2ENERGY.addProduct(beeswax, 0.80f);
Items.IC2ENERGY.addProduct(new ItemStack(net.minecraft.init.Items.redstone, 1, 0), 0.75f);
Items.IC2ENERGY.addProduct(EnumHoneyDrop.ENERGY.get(1), 1.00f);
Items.IRON.copyProducts(Items.STONE);
Items.IRON.addProduct(IronDust.get(1), 1.00f);
Items.GOLD.copyProducts(Items.STONE);
Items.GOLD.addProduct(GoldDust.get(1), 1.00f);
Items.COPPER.copyProducts(Items.STONE);
Items.COPPER.addProduct(CopperDust.get(1), 1.00f);
Items.TIN.copyProducts(Items.STONE);
Items.TIN.addProduct(TinDust.get(1), 1.00f);
Items.NICKEL.copyProducts(Items.STONE);
Items.NICKEL.addProduct(NickelDust.get(1), 1.00f);
Items.SILVER.copyProducts(Items.STONE);
Items.SILVER.addProduct(SilverDust.get(1), 1.00f);
Items.URANIUM.copyProducts(Items.STONE);
if (!OreDictionary.getOres("crushedUranium").isEmpty()) {
Items.URANIUM.addProduct(OreDictionary.getOres("crushedUranium").get(0), 0.50f);
}
Items.CLAY.addProduct(beeswax, 0.25f);
Items.CLAY.addProduct(honeyDrop, 0.80f);
Items.CLAY.addProduct(new ItemStack(net.minecraft.init.Items.clay_ball), 0.80f);
Items.OLD.addProduct(beeswax, 1.00f);
Items.OLD.addProduct(honeyDrop, 0.90f);
Items.FUNGAL.addProduct(beeswax, 0.90f);
Items.FUNGAL.addProduct(new ItemStack(Blocks.brown_mushroom_block, 1, 0), 1.00f);
Items.FUNGAL.addProduct(new ItemStack(Blocks.red_mushroom_block, 1, 0), 0.75f);
Items.ACIDIC.addProduct(beeswax, 0.80f);
Items.ACIDIC.addProduct(EnumHoneyDrop.ACID.get(1), 0.50f);
if (!OreDictionary.getOres("dustSulfur").isEmpty()) {
Items.ACIDIC.addProduct(OreDictionary.getOres("dustSulfur").get(0), 0.75f);
}
Items.VENOMOUS.addProduct(beeswax, 0.80f);
Items.VENOMOUS.addProduct(EnumHoneyDrop.POISON.get(1), 0.80f);
Items.SLIME.addProduct(beeswax, 1.00f);
Items.SLIME.addProduct(honeyDrop, 0.75f);
Items.SLIME.addProduct(new ItemStack(net.minecraft.init.Items.slime_ball, 1, 0), 0.75f);
Items.BLAZE.addProduct(beeswax, 0.75f);
Items.BLAZE.addProduct(new ItemStack(net.minecraft.init.Items.blaze_powder, 1, 0), 1.00f);
Items.COFFEE.addProduct(beeswax, 0.90f);
Items.COFFEE.addProduct(honeyDrop, 0.75f);
Items.COFFEE.addProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
Items.GLACIAL.addProduct(EnumHoneyDrop.ICE.get(1), 0.80f);
Items.GLACIAL.addProduct(honeyDrop, 0.75f);
Items.SHADOW.addProduct(honeyDrop, 0.50f);
if (!OreDictionary.getOres("dustObsidian").isEmpty()) {
Items.SHADOW.addProduct(OreDictionary.getOres("dustObsidian").get(0), 0.75f);
}
Items.LEAD.copyProducts(Items.STONE);
Items.LEAD.addProduct(LeadDust.get(1), 1.00f);
Items.ZINC.copyProducts(Items.STONE);
Items.ZINC.addProduct(ZincDust.get(1), 1.00f);
Items.TITANIUM.copyProducts(Items.STONE);
Items.TITANIUM.addProduct(TitaniumDust.get(1), 1.00f);
Items.TUNGSTEN.copyProducts(Items.STONE);
Items.TUNGSTEN.addProduct(TungstenDust.get(1), 1.00f);
Items.PLATINUM.copyProducts(Items.STONE);
Items.PLATINUM.addProduct(PlatinumDust.get(1), 1.00f);
Items.LAPIS.copyProducts(Items.STONE);
Items.LAPIS.addProduct(new ItemStack(dye, 6, 4), 1.00f);
Items.EMERALD.copyProducts(Items.STONE);
Items.EMERALD.addProduct(EmeraldShard.get(1), 1.00f);
Items.RUBY.copyProducts(Items.STONE);
Items.RUBY.addProduct(RubyShard.get(1), 1.00f);
Items.SAPPHIRE.copyProducts(Items.STONE);
Items.SAPPHIRE.addProduct(SapphireShard.get(1), 1.00f);
Items.DIAMOND.copyProducts(Items.STONE);
Items.DIAMOND.addProduct(DiamondShard.get(1), 1.00f);
Items.RED.addProduct(honeyDrop, 0.80f);
Items.RED.addProduct(beeswax, 0.80f);
Items.GLOWSTONE.addProduct(honeyDrop, 0.25f);
Items.GLOWSTONE.addProduct(new ItemStack(net.minecraft.init.Items.glowstone_dust), 1.00f);
Items.SALTPETER.addProduct(honeyDrop, 0.25f);
final List<ItemStack> ores = OreDictionary.getOres("dustSaltpeter");
final ItemStack saltpeter = ores.isEmpty() ? null : ores.get(0);
Items.SALTPETER.addProduct(saltpeter, 1.00f);
Items.COMPOST.addProduct(honeyDrop, 0.25f);
Items.COMPOST.addProduct(Mods.forestry.stack("fertilizerBio"), 1.00f);
Items.SAWDUST.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustSawdust").isEmpty()) {
Items.SAWDUST.addProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f);
} else if (!OreDictionary.getOres("sawdust").isEmpty()) {
Items.SAWDUST.addProduct(OreDictionary.getOres("sawdust").get(0), 1.00f);
}
Items.CERTUS.addProduct(honeyDrop, 0.25f);
Items.CERTUS.addProduct(new ItemStack(net.minecraft.init.Items.quartz), 0.25f);
if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) {
Items.CERTUS.addProduct(OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f);
}
Items.ENDERPEARL.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) {
Items.ENDERPEARL.addProduct(OreDictionary.getOres("dustEnderPearl").get(0), 0.25f);
}
Items.YELLORIUM.copyProducts(Items.STONE);
Items.YELLORIUM.addProduct(YelloriumDust.get(1), 0.25f);
Items.CYANITE.copyProducts(Items.STONE);
Items.CYANITE.addProduct(CyaniteDust.get(1), 0.25f);
Items.BLUTONIUM.copyProducts(Items.STONE);
Items.BLUTONIUM.addProduct(BlutoniumDust.get(1), 0.25f);
OreDictionary.registerOre("beeComb", new ItemStack(EBItems.comb, 1, 32767));
// Copy the default products on RED, then add a drop
for (int i = 0; i < 16; ++i) {
final Items dyeComb = Items.VALUES[Items.RED.ordinal() + i];
final EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
if (dyeComb != Items.RED) {
dyeComb.copyProducts(Items.RED);
dyeComb.addProduct(drop.get(1), 1);
}
}
// RED gets its drop later, to avoid copying it to all the others
Items.RED.addProduct(EnumHoneyDrop.RED.get(1), 1);
// Add dyes to binnie drops
// TODO: move this to itemDrop
for (int i = 0; i < 16; ++i) {
final EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
drop.addRemenant(EBMisc.Items.getDye(i));
}
}
}
src/main/java/binnie/extrabees/products/EnumHoneyComb.java
-160
View File
@@ -1,160 +0,0 @@
package binnie.extrabees.products;
import binnie.extrabees.item.EBItems;
import java.awt.Color;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
import net.minecraft.item.ItemStack;
import binnie.core.item.IItemEnum;
import binnie.core.util.I18N;
import forestry.api.recipes.RecipeManagers;
public enum EnumHoneyComb implements IItemEnum {
BARREN(new Color(0x736c44), new Color(0xc2bea7)),
ROTTEN(new Color(0x3e5221), new Color(0xb1cc89)),
BONE(new Color(0xc4c4af), new Color(0xdedec1)),
OIL(new Color(0x060608), new Color(0x2c2b36)),
COAL(new Color(0x9e9478), new Color(0x38311e)),
FUEL(new Color(0x9c6f40), new Color(0xffc400)),
WATER(new Color(0x2732cf), new Color(0x79a8c9)),
MILK(new Color(0xd7d9c7), new Color(0xffffff)),
FRUIT(new Color(0x7d2934), new Color(0xdb4f62)),
SEED(new Color(0x344f33), new Color(0x71cc6e)),
ALCOHOL(new Color(0x418521), new Color(0xded94e)),
STONE(new Color(0x8c8c91), new Color(0xc6c6cc)),
REDSTONE(new Color(0xfa9696), new Color(0xe61010)),
RESIN(new Color(0xffc74f), new Color(0xc98a00)),
IC2ENERGY(new Color(0xe9f50f), new Color(0x20b3c9)),
IRON(new Color(0x363534), new Color(0xa87058)),
GOLD(new Color(0x363534), new Color(0xe6cc0b)),
COPPER(new Color(0x363534), new Color(0xd16308)),
TIN(new Color(0x363534), new Color(0xbdb1bd)),
SILVER(new Color(0x363534), new Color(0xdbdbdb)),
// BRONZE,
URANIUM(new Color(0x1eff00), new Color(0x41ab33)),
CLAY(new Color(0x6b563a), new Color(0xb0c0d6)),
OLD(new Color(0x453314), new Color(0xb39664)),
FUNGAL(new Color(0x6e654b), new Color(0x2b9443)),
CREOSOTE(new Color(0x9c810c), new Color(0xbdaa57)),
LATEX(new Color(0x595541), new Color(0xa8a285)),
ACIDIC(new Color(0x348543), new Color(0x14f73e)),
VENOMOUS(new Color(0x7d187d), new Color(0xff33ff)),
SLIME(new Color(0x3b473c), new Color(0x80d185)),
BLAZE(new Color(0xff6a00), new Color(0xffcc00)),
COFFEE(new Color(0x54381d), new Color(0xb37f4b)),
GLACIAL(new Color(0x4e8787), new Color(0xcbf2f2)),
// MINT,
// CITRUS,
// PEAT,
SHADOW(new Color(0x000000), new Color(0x361835)),
LEAD(new Color(0x363534), new Color(0x9a809c)),
// BRASS,
// ELECTRUM,
ZINC(new Color(0x363534), new Color(0xedebff)),
TITANIUM(new Color(0x363534), new Color(0xb0aae3)),
TUNGSTEN(new Color(0x363534), new Color(0x131214)),
// STEEL,
// IRIDIUM,
PLATINUM(new Color(0x363534), new Color(0x9a809c)),
LAPIS(new Color(0x363534), new Color(0x3d2cdb)),
// SODALITE,
// PYRITE,
// BAUXITE,
// CINNABAR,
// SPHALERITE,
EMERALD(new Color(0x363534), new Color(0x1cff03)),
RUBY(new Color(0x363534), new Color(0xd60000)),
SAPPHIRE(new Color(0x363534), new Color(0xa47ff)),
// OLIVINE,
DIAMOND(new Color(0x363534), new Color(0x7fbdfa)),
RED(new Color(0xcc4c4c), new Color(0xff0000)),
YELLOW(new Color(0xe5e533), new Color(0xffdd00)),
BLUE(new Color(0x99b2f2), new Color(0x0022ff)),
GREEN(new Color(0x667f33), new Color(0x009900)),
BLACK(new Color(0x191919), new Color(0x575757)),
WHITE(new Color(0xd6d6d6), new Color(0xffffff)),
BROWN(new Color(0x7f664c), new Color(0x5c350f)),
ORANGE(new Color(0xf2b233), new Color(0xff9d00)),
CYAN(new Color(0x4c99b2), new Color(0x00ffe5)),
PURPLE(new Color(0xb266e5), new Color(0xae00ff)),
GRAY(new Color(0x4c4c4c), new Color(0xbababa)),
LIGHTBLUE(new Color(0x99b2f2), new Color(0x009dff)),
PINK(new Color(0xf2b2cc), new Color(0xff80df)),
LIMEGREEN(new Color(0x7fcc19), new Color(0x00ff08)),
MAGENTA(new Color(0xe57fd8), new Color(0xff00cc)),
LIGHTGRAY(new Color(0x999999), new Color(0xc9c9c9)),
NICKEL(new Color(0x363534), new Color(0xffdefc)),
// INVAR,
GLOWSTONE(new Color(0xa69c5e), new Color(0xe0c409)),
SALTPETER(new Color(0xa69c5e), new Color(0xe0c409)),
// PULP,
// MULCH,
COMPOST(new Color(0x423308), new Color(0x6b5e3b)),
SAWDUST(new Color(0xbfaa71), new Color(0xf2d37e)),
CERTUS(new Color(0xc6d0ff), new Color(0x394d63)),
ENDERPEARL(new Color(0x349786), new Color(0x32620)),
YELLORIUM(new Color(0x27204d), new Color(14019840)),
CYANITE(new Color(0x27204d), new Color(0x86ed)),
BLUTONIUM(new Color(0x27204d), new Color(0x1b00e6));
public final Map<ItemStack, Float> products;
public final int primaryColor;
public final int secondaryColor;
public final String name;
boolean active;
EnumHoneyComb(Color primaryColor, Color secondaryColor) {
this.primaryColor = primaryColor.getRGB();
this.secondaryColor = secondaryColor.getRGB();
name = toString().toLowerCase(Locale.ENGLISH);
products = new LinkedHashMap<>();
}
public static EnumHoneyComb get(ItemStack itemStack) {
int i = itemStack.getItemDamage();
if (i >= 0 && i < values().length) {
return values()[i];
}
return values()[0];
}
public void addRecipe() {
RecipeManagers.centrifugeManager.addRecipe(20, get(1), products);
}
@Override
public boolean isActive() {
return active;
}
@Override
public ItemStack get(int count) {
return new ItemStack(EBItems.comb, count, ordinal());
}
@Override
public String getName(ItemStack stack) {
return I18N.localise("extrabees.item.comb." + name);
}
public boolean addProduct(ItemStack item, Float chance) {
if (item == null) {
return false;
}
products.put(item.copy(), chance);
return true;
}
public void tryAddProduct(ItemStack item, Float chance) {
active = addProduct(item, chance);
}
public void copyProducts(EnumHoneyComb comb) {
products.putAll(comb.products);
}
}
src/main/java/binnie/extrabees/products/ItemHoneyComb.java
-357
View File
@@ -1,357 +0,0 @@
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;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.oredict.OreDictionary;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.core.Tabs;
public class ItemHoneyComb extends ItemProduct {
protected IIcon icon1;
protected IIcon icon2;
public ItemHoneyComb() {
super(EnumHoneyComb.values());
final String name = "honeyComb";
setCreativeTab(Tabs.tabApiculture);
setUnlocalizedName(name);
GameRegistry.registerItem(this, name);
}
public static void addSubtypes() {
ItemStack beeswax = Mods.forestry.stack("beeswax");
ItemStack honeyDrop = Mods.forestry.stack("honeyDrop");
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
OreDictionary.registerOre("gemEmerald", Items.emerald);
OreDictionary.registerOre("gemLapis", new ItemStack(Items.dye, 1, 4));
EnumHoneyComb.BARREN.addProduct(beeswax, 1.00f);
EnumHoneyComb.BARREN.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.ROTTEN.addProduct(beeswax, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.ROTTEN.addProduct(new ItemStack(Items.rotten_flesh, 1, 0), 0.80f);
EnumHoneyComb.BONE.addProduct(beeswax, 0.20f);
EnumHoneyComb.BONE.addProduct(honeyDrop, 0.20f);
EnumHoneyComb.BONE.addProduct(new ItemStack(Items.dye, 1, 15), 0.80f);
EnumHoneyComb.OIL.tryAddProduct(Propolis.Items.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(CoalDust.get(1), 1.00f);
EnumHoneyComb.WATER.tryAddProduct(Propolis.Items.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.get(1), 1.00f);
EnumHoneyComb.MILK.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FRUIT.tryAddProduct(EnumHoneyDrop.APPLE.get(1), 1.00f);
EnumHoneyComb.FRUIT.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.SEED.tryAddProduct(EnumHoneyDrop.SEED.get(1), 1.00f);
EnumHoneyComb.SEED.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.ALCOHOL.tryAddProduct(EnumHoneyDrop.ALCOHOL.get(1), 1.00f);
EnumHoneyComb.ALCOHOL.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FUEL.tryAddProduct(Propolis.Items.FUEL.get(1), 0.60f);
EnumHoneyComb.FUEL.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.CREOSOTE.tryAddProduct(Propolis.Items.CREOSOTE.get(1), 0.70f);
EnumHoneyComb.CREOSOTE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.LATEX.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.LATEX.addProduct(beeswax, 0.85f);
if (!OreDictionary.getOres("itemRubber").isEmpty()) {
EnumHoneyComb.LATEX.tryAddProduct(OreDictionary.getOres("itemRubber").get(0), 1.00f);
} else {
EnumHoneyComb.LATEX.active = false;
}
EnumHoneyComb.REDSTONE.addProduct(beeswax, 0.80f);
EnumHoneyComb.REDSTONE.addProduct(new ItemStack(Items.redstone, 1, 0), 1.00f);
EnumHoneyComb.REDSTONE.addProduct(honeyDrop, 0.50f);
EnumHoneyComb.RESIN.addProduct(beeswax, 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 1.00f);
EnumHoneyComb.RESIN.tryAddProduct(Mods.ic2.stack("itemHarz"), 0.50f);
EnumHoneyComb.IC2ENERGY.addProduct(beeswax, 0.80f);
EnumHoneyComb.IC2ENERGY.addProduct(new ItemStack(Items.redstone, 1, 0), 0.75f);
EnumHoneyComb.IC2ENERGY.tryAddProduct(EnumHoneyDrop.ENERGY.get(1), 1.00f);
EnumHoneyComb.IRON.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.IRON.tryAddProduct(IronDust.get(1), 1.00f);
EnumHoneyComb.GOLD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.GOLD.tryAddProduct(GoldDust.get(1), 1.00f);
EnumHoneyComb.COPPER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.COPPER.tryAddProduct(CopperDust.get(1), 1.00f);
EnumHoneyComb.TIN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TIN.tryAddProduct(TinDust.get(1), 1.00f);
EnumHoneyComb.NICKEL.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.NICKEL.tryAddProduct(NickelDust.get(1), 1.00f);
EnumHoneyComb.SILVER.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SILVER.tryAddProduct(SilverDust.get(1), 1.00f);
EnumHoneyComb.URANIUM.copyProducts(EnumHoneyComb.STONE);
if (!OreDictionary.getOres("crushedUranium").isEmpty()) {
EnumHoneyComb.URANIUM.tryAddProduct(OreDictionary.getOres("crushedUranium").get(0), 0.50f);
}
EnumHoneyComb.CLAY.addProduct(beeswax, 0.25f);
EnumHoneyComb.CLAY.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.CLAY.addProduct(new ItemStack(Items.clay_ball), 0.80f);
EnumHoneyComb.OLD.addProduct(beeswax, 1.00f);
EnumHoneyComb.OLD.addProduct(honeyDrop, 0.90f);
EnumHoneyComb.FUNGAL.addProduct(beeswax, 0.90f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.brown_mushroom_block, 1, 0), 1.00f);
EnumHoneyComb.FUNGAL.addProduct(new ItemStack(Blocks.red_mushroom_block, 1, 0), 0.75f);
EnumHoneyComb.ACIDIC.addProduct(beeswax, 0.80f);
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.get(1), 0.80f);
EnumHoneyComb.SLIME.addProduct(beeswax, 1.00f);
EnumHoneyComb.SLIME.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SLIME.addProduct(new ItemStack(Items.slime_ball, 1, 0), 0.75f);
EnumHoneyComb.BLAZE.addProduct(beeswax, 0.75f);
EnumHoneyComb.BLAZE.addProduct(new ItemStack(Items.blaze_powder, 1, 0), 1.00f);
EnumHoneyComb.COFFEE.addProduct(beeswax, 0.90f);
EnumHoneyComb.COFFEE.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.COFFEE.tryAddProduct(Mods.ic2.stack("itemCofeePowder"), 0.75f);
EnumHoneyComb.GLACIAL.tryAddProduct(EnumHoneyDrop.ICE.get(1), 0.80f);
EnumHoneyComb.GLACIAL.addProduct(honeyDrop, 0.75f);
EnumHoneyComb.SHADOW.addProduct(honeyDrop, 0.50f);
if (!OreDictionary.getOres("dustObsidian").isEmpty()) {
EnumHoneyComb.SHADOW.tryAddProduct(OreDictionary.getOres("dustObsidian").get(0), 0.75f);
} else {
EnumHoneyComb.SHADOW.active = false;
}
EnumHoneyComb.LEAD.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.LEAD.tryAddProduct(LeadDust.get(1), 1.00f);
EnumHoneyComb.ZINC.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.ZINC.tryAddProduct(ZincDust.get(1), 1.00f);
EnumHoneyComb.TITANIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TITANIUM.tryAddProduct(TitaniumDust.get(1), 1.00f);
EnumHoneyComb.TUNGSTEN.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.TUNGSTEN.tryAddProduct(TungstenDust.get(1), 1.00f);
EnumHoneyComb.PLATINUM.copyProducts(EnumHoneyComb.STONE);
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(EmeraldShard.get(1), 1.00f);
EnumHoneyComb.RUBY.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.RUBY.tryAddProduct(RubyShard.get(1), 1.00f);
EnumHoneyComb.SAPPHIRE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.SAPPHIRE.tryAddProduct(SapphireShard.get(1), 1.00f);
EnumHoneyComb.DIAMOND.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.DIAMOND.tryAddProduct(DiamondShard.get(1), 1.00f);
EnumHoneyComb.RED.addProduct(honeyDrop, 0.80f);
EnumHoneyComb.RED.addProduct(beeswax, 0.80f);
EnumHoneyComb.GLOWSTONE.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.GLOWSTONE.addProduct(new ItemStack(Items.glowstone_dust), 1.00f);
EnumHoneyComb.SALTPETER.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.SALTPETER.tryAddProduct(getOreDictionary("dustSaltpeter"), 1.00f);
EnumHoneyComb.COMPOST.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.COMPOST.tryAddProduct(Mods.forestry.stack("fertilizerBio"), 1.00f);
EnumHoneyComb.SAWDUST.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustSawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("dustSawdust").get(0), 1.00f);
} else if (!OreDictionary.getOres("sawdust").isEmpty()) {
EnumHoneyComb.SAWDUST.tryAddProduct(OreDictionary.getOres("sawdust").get(0), 1.00f);
}
EnumHoneyComb.CERTUS.addProduct(honeyDrop, 0.25f);
EnumHoneyComb.CERTUS.addProduct(new ItemStack(Items.quartz), 0.25f);
if (!OreDictionary.getOres("dustCertusQuartz").isEmpty()) {
EnumHoneyComb.CERTUS.tryAddProduct(OreDictionary.getOres("dustCertusQuartz").get(0), 0.20f);
}
EnumHoneyComb.ENDERPEARL.addProduct(honeyDrop, 0.25f);
if (!OreDictionary.getOres("dustEnderPearl").isEmpty()) {
EnumHoneyComb.ENDERPEARL.tryAddProduct(OreDictionary.getOres("dustEnderPearl").get(0), 0.25f);
}
EnumHoneyComb.YELLORIUM.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.YELLORIUM.tryAddProduct(YelloriumDust.get(1), 0.25f);
EnumHoneyComb.CYANITE.copyProducts(EnumHoneyComb.STONE);
EnumHoneyComb.CYANITE.tryAddProduct(CyaniteDust.get(1), 0.25f);
EnumHoneyComb.BLUTONIUM.copyProducts(EnumHoneyComb.STONE);
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];
if (type != EnumHoneyComb.RED) {
type.copyProducts(EnumHoneyComb.RED);
}
}
for (int i = 0; i < 16; ++i) {
EnumHoneyComb type = EnumHoneyComb.values()[EnumHoneyComb.RED.ordinal() + i];
EnumHoneyDrop drop = EnumHoneyDrop.values()[EnumHoneyDrop.RED.ordinal() + i];
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 -> 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);
drop.addRemenant(dye);
}
}
private static ItemStack getOreDictionary(String string) {
if (!OreDictionary.getOres(string).isEmpty()) {
return OreDictionary.getOres(string).get(0);
}
return null;
}
@Override
@SideOnly(Side.CLIENT)
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public int getColorFromItemStack(ItemStack stack, int indexColor) {
EnumHoneyComb comb = EnumHoneyComb.get(stack);
if (comb == null) {
return 0xffffff;
}
if (indexColor == 0) {
return comb.primaryColor;
}
return comb.secondaryColor;
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int i, int j) {
if (j > 0) {
return icon1;
}
return icon2;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
icon1 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.0");
icon2 = BinnieCore.proxy.getIcon(register, "forestry", "beeCombs.1");
}
public enum VanillaComb {
HONEY,
COCOA,
SIMMERING,
STRINGY,
FROZEN,
DRIPPING,
SILKY,
PARCHED,
MYSTERIOUS,
IRRADIATED,
POWDERY,
REDDENED,
DARKENED,
OMEGA,
WHEATEN,
MOSSY,
QUARTZ;
public ItemStack get() {
return new ItemStack(Mods.forestry.item("beeCombs"), 1, ordinal());
}
}
}
src/main/java/binnie/extrabees/products/ModuleProducts.java
+2 -16
View File
@@ -1,27 +1,13 @@
package binnie.extrabees.products;
import binnie.core.IInitializable;
import net.minecraft.init.Items;
import net.minecraftforge.oredict.OreDictionary;
public class ModuleProducts implements IInitializable {
@Override
public void preInit() {
OreDictionary.registerOre("ingotIron", Items.iron_ingot);
OreDictionary.registerOre("ingotGold", Items.gold_ingot);
OreDictionary.registerOre("gemDiamond", Items.diamond);
}
@Override
public void init() {
ItemHoneyComb.addSubtypes();
}
@Override
public void postInit() {
for (EnumHoneyComb info : EnumHoneyComb.values()) {
info.addRecipe();
for (CombItems.Items comb : CombItems.Items.VALUES) {
comb.addRecipe();
}
for (EnumHoneyDrop info2 : EnumHoneyDrop.values()) {
info2.addRecipe();
src/main/java/binnie/extrabees/products/Propolis.java
+18 -3
View File
@@ -1,5 +1,6 @@
package binnie.extrabees.products;
import static binnie.extrabees.ExtraBees.EB_MODID;
import static binnie.extrabees.item.EBItems.propolis;
import binnie.Binnie;
@@ -10,7 +11,9 @@ import forestry.api.core.Tabs;
import forestry.api.recipes.RecipeManagers;
import java.awt.Color;
import java.util.Arrays;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
public class Propolis extends DamageItems {
@@ -47,8 +50,9 @@ public class Propolis extends DamageItems {
// I don't like this, but the modid is actually only used for registering icons and names, so it's fine
super(
Tabs.tabApiculture,
"forestry",
EB_MODID,
"propolis",
true,
Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new));
setMaxStackSize(64);
@@ -68,7 +72,18 @@ public class Propolis extends DamageItems {
}
@Override
public String getIconName(int damage) {
return "propolis.0";
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister register) {
itemIcon = register.registerIcon("forestry:propolis.0");
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return itemIcon;
}
@Override
public IIcon getIconFromDamage(int damage) {
return itemIcon;
}
}