diff --git a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java index 054bc3ada..fb3e0d6e 100644 --- a/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java +++ b/src/main/java/binnie/extratrees/genetics/ButterflySpecies.java @@ -1,6 +1,7 @@ package binnie.extratrees.genetics; import binnie.Binnie; +import binnie.Constants; import binnie.core.Mods; import binnie.core.resource.BinnieResource; import binnie.core.resource.ResourceType; @@ -16,9 +17,13 @@ import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.EnumFlutterType; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterflyRoot; +import forestry.lepidopterology.genetics.alleles.AlleleButterflySpecies; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.BiomeDictionary; @@ -28,28 +33,28 @@ import java.util.Map; import java.util.Set; public enum ButterflySpecies implements IAlleleButterflySpecies { - WhiteAdmiral("White Admiral", "Limenitis camilla", 16448250), - PurpleEmperor("Purple Emperor", "Apatura iris", 4338374), - RedAdmiral("Red Admiral", "Vanessa atalanta", 15101764), - PaintedLady("Painted Lady", "Vanessa cardui", 15573064), - SmallTortoiseshell("Small Tortoiseshell", "Aglais urticae", 15365387), - CamberwellBeauty("Camberwell Beauty", "Aglais antiopa", 9806540), + White_Admiral("White Admiral", "Limenitis camilla", 16448250), + Purple_Emperor("Purple Emperor", "Apatura iris", 4338374), + Red_Admiral("Red Admiral", "Vanessa atalanta", 15101764), + Painted_Lady("Painted Lady", "Vanessa cardui", 15573064), + Small_Tortoiseshell("Small Tortoiseshell", "Aglais urticae", 15365387), + Camberwell_Beauty("Camberwell Beauty", "Aglais antiopa", 9806540), Peacock("Peacock", "Inachis io", 13842434), Wall("Wall", "Lasiommata megera", 15707678), - CrimsonRose("Crimson Rose", "Atrophaneura hector", 16736891), - KaiserIHind("Kaiser-i-Hind", "Teinopalpus imperialis", 7839808), - GoldenBirdwing("Golden Birdwing", "Troides aeacus", 16374814), - MarshFritillary("Marsh Fritillary", "Euphydryas aurinia", 16747520), - PearlBorderedFritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 16747267), - QueenOfSpainFritillary("Queen of Spain Fritillary", "Issoria lathonia", 16765247), - SpeckledWood("Speckled Wood", "Pararge aegeria", 16119949), - ScotchAngus("Scotch Angus", "Erebia aethiops", 12735523), + Crimson_Rose("Crimson Rose", "Atrophaneura hector", 16736891), + Kaiser_I_Hind("Kaiser-i-Hind", "Teinopalpus imperialis", 7839808), + Golden_Birdwing("Golden Birdwing", "Troides aeacus", 16374814), + Marsh_Fritillary("Marsh Fritillary", "Euphydryas aurinia", 16747520), + Pearl_Bordered_Fritillary("Pearl-bordered Fritillary", "Boloria euphrosyne", 16747267), + Queen_Of_Spain_Fritillary("Queen of Spain Fritillary", "Issoria lathonia", 16765247), + Speckled_Wood("Speckled Wood", "Pararge aegeria", 16119949), + Scotch_Angus("Scotch Angus", "Erebia aethiops", 12735523), Gatekeeper("Gatekeeper", "Pyronia tithonus", 16433962), - MeadowBrown("Meadow Brown", "Maniola jurtina", 14914841), - SmallHeath("Small Heath", "Coenonympha pamphilus", 16754226), + Meadow_Brown("Meadow Brown", "Maniola jurtina", 14914841), + Small_Heath("Small Heath", "Coenonympha pamphilus", 16754226), Ringlet("Ringlet", "Aphantopus hyperantus", 9919799), Monarch("Monarch", "Danaus plexippus", 16757254), - MarbledWhite("Marbled White", "Melanargia galathea", 15527148); + Marbled_White("Marbled White", "Melanargia galathea", 15527148); private String name; private String branchName; @@ -151,17 +156,19 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public String getItemTexture() { - return ""; + return getModID() + ":items/butterflies/" + toString().toLowerCase(); } @Override public void registerSprites() { - + String spriteName = getItemTexture(); + TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks(); + textureMap.registerSprite(new ResourceLocation(spriteName)); } @Override public String getModID() { - return "extratrees"; + return Constants.EXTRA_TREES_MOD_ID; } @@ -169,7 +176,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies { @Override public String getUID() { - return "extrabutterflies.species." + this.toString().toLowerCase(); + return "extrabutterflies.species." + this.toString().toLowerCase().replace("_", ""); } @Override diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png b/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png new file mode 100644 index 00000000..699b36ce Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/camberwell_beauty.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png b/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png new file mode 100644 index 00000000..9e3cfa65 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/crimson_rose.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png b/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png new file mode 100644 index 00000000..0ce72c97 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/gatekeeper.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png b/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png new file mode 100644 index 00000000..827ff8ba Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/golden_birdwing.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png b/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png new file mode 100644 index 00000000..b3b169d7 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/kaiser_i_hind.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png b/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png new file mode 100644 index 00000000..051f41a0 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/marbled_white.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png b/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png new file mode 100644 index 00000000..da31d80b Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/marsh_fritillary.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png b/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png new file mode 100644 index 00000000..0bcd39fd Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/meadow_brown.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png b/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png new file mode 100644 index 00000000..abfa094f Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/monarch.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png b/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png new file mode 100644 index 00000000..86a6dc38 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/painted_lady.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png b/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png new file mode 100644 index 00000000..41720492 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/peacock.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png b/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png new file mode 100644 index 00000000..a8e3177c Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/pearl_bordered_fritillary.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png b/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png new file mode 100644 index 00000000..fe3ab742 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/purple_emperor.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png b/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png new file mode 100644 index 00000000..613e8bd4 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/queen_of_spain_fritillary.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png b/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png new file mode 100644 index 00000000..c18267df Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/red_admiral.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png b/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png new file mode 100644 index 00000000..3870eeee Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/ringlet.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png b/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png new file mode 100644 index 00000000..5717aec0 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/scotch_angus.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png b/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png new file mode 100644 index 00000000..6cd67bf2 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/small_heath.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png b/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png new file mode 100644 index 00000000..0dfbf72f Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/small_tortoiseshell.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png b/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png new file mode 100644 index 00000000..28fd3fec Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/speckled_wood.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png b/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png new file mode 100644 index 00000000..14eb913a Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/wall.png differ diff --git a/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png b/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png new file mode 100644 index 00000000..6396a049 Binary files /dev/null and b/src/main/resources/assets/extratrees/textures/items/butterflies/white_admiral.png differ