diff --git a/gradle.properties b/gradle.properties index 918b70e..986b3d9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=2 version_minor=3 -version_rev=1 +version_rev=2 version_forestry=3.4.0.7 version_bloodmagic=1.3.1-7 diff --git a/src/main/java/magicbees/bees/BeeProductHelper.java b/src/main/java/magicbees/bees/BeeProductHelper.java index 5699996..6630a94 100644 --- a/src/main/java/magicbees/bees/BeeProductHelper.java +++ b/src/main/java/magicbees/bees/BeeProductHelper.java @@ -71,7 +71,7 @@ public class BeeProductHelper { BIGBAD.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 18) .addProduct(new ItemStack(Items.beef), 12) .addProduct(new ItemStack(Items.chicken), 12) - .addSpecialty(new ItemStack(Items.melon), 10); + .addSpecialty(new ItemStack(Items.melon), 20); TIMELY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 16); LORDLY.addProduct(Config.combs.getStackForType(CombType.TEMPORAL), 19); diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index 81227ef..710462f 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -115,7 +115,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider LORDLY("Lordly", "rassilonis", BeeClassification.TIME, 0xC6AF86, 0x8E0213, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), DOCTORAL("Doctoral", "medicus qui", BeeClassification.TIME, - 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false), + 0xDDE5FC, 0x4B6E8C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false), INFERNAL("Infernal", "infernales", BeeClassification.ABOMINABLE, 0xFF1C1C, BodyColours.ABOMINABLE, EnumTemperature.HELLISH, EnumHumidity.ARID, false, true), @@ -882,6 +882,10 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider case TE_PYRO: value = CommonProxy.DOMAIN + ":bees/skulking/"; break; + + case DOCTORAL: + value = CommonProxy.DOMAIN + ":bees/doctoral/"; + break; default: value = ForestryHelper.Name.toLowerCase() + ":bees/default/"; diff --git a/src/main/java/magicbees/block/BlockMagicApiary.java b/src/main/java/magicbees/block/BlockMagicApiary.java index e60e73e..92bf0cb 100644 --- a/src/main/java/magicbees/block/BlockMagicApiary.java +++ b/src/main/java/magicbees/block/BlockMagicApiary.java @@ -59,7 +59,7 @@ public class BlockMagicApiary extends BlockContainer }else if (side == 2 || side == 3){ return icons[2]; }else{ - return icons[4]; + return icons[3]; } } @@ -67,12 +67,12 @@ public class BlockMagicApiary extends BlockContainer @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - icons = new IIcon[5]; + icons = new IIcon[4]; icons[0] = register.registerIcon(CommonProxy.DOMAIN + ":thaumicapiary.0"); icons[1] = register.registerIcon(CommonProxy.DOMAIN + ":thaumicapiary.1"); icons[2] = register.registerIcon(CommonProxy.DOMAIN + ":thaumicapiary.2"); - icons[4] = register.registerIcon(CommonProxy.DOMAIN + ":thaumicapiary.4"); + icons[3] = register.registerIcon(CommonProxy.DOMAIN + ":thaumicapiary.4"); } @Override diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/body1.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/body1.png new file mode 100644 index 0000000..6a02560 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/body1.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png new file mode 100644 index 0000000..e05916f Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png.mcmeta new file mode 100644 index 0000000..0e1c12b --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.body2.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":64},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2},{"index":0,"time":96},{"index":3,"time":4},{"index":0,"time":128},{"index":4,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png new file mode 100644 index 0000000..87f05f7 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png.mcmeta new file mode 100644 index 0000000..0e1c12b --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/drone.outline.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":64},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2},{"index":0,"time":96},{"index":3,"time":4},{"index":0,"time":128},{"index":4,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png new file mode 100644 index 0000000..0f63aaf Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png.mcmeta new file mode 100644 index 0000000..952d5f2 --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":2,"frametime":1,"frames":[{"index":0,"time":64},{"index":1,"time":2},{"index":0,"time":48},{"index":1,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png new file mode 100644 index 0000000..a502723 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png.mcmeta new file mode 100644 index 0000000..952d5f2 --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.body2.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":2,"frametime":1,"frames":[{"index":0,"time":64},{"index":1,"time":2},{"index":0,"time":48},{"index":1,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png new file mode 100644 index 0000000..44430b1 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png.mcmeta new file mode 100644 index 0000000..952d5f2 --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/larvae.outline.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":2,"frametime":1,"frames":[{"index":0,"time":64},{"index":1,"time":2},{"index":0,"time":48},{"index":1,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png new file mode 100644 index 0000000..bf3c812 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png.mcmeta new file mode 100644 index 0000000..66c1358 --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.body2.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":128},{"index":3,"time":4},{"index":0,"time":96},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2},{"index":0,"time":64},{"index":4,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png new file mode 100644 index 0000000..87f05f7 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png.mcmeta new file mode 100644 index 0000000..66c1358 --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/princess.outline.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":128},{"index":3,"time":4},{"index":0,"time":96},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2},{"index":0,"time":64},{"index":4,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png new file mode 100644 index 0000000..bb7b8c8 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png.mcmeta new file mode 100644 index 0000000..ec8d8ca --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.body2.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":96},{"index":3,"time":4},{"index":0,"time":64},{"index":4,"time":2},{"index":0,"time":128},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2}]}} \ No newline at end of file diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png new file mode 100644 index 0000000..87f05f7 Binary files /dev/null and b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png differ diff --git a/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png.mcmeta b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png.mcmeta new file mode 100644 index 0000000..ec8d8ca --- /dev/null +++ b/src/main/resources/assets/magicbees/textures/items/bees/doctoral/queen.outline.png.mcmeta @@ -0,0 +1 @@ +{"animation":{"width":1,"height":5,"frametime":1,"frames":[{"index":0,"time":96},{"index":3,"time":4},{"index":0,"time":64},{"index":4,"time":2},{"index":0,"time":128},{"index":1,"time":2},{"index":2,"time":2},{"index":1,"time":2}]}} \ No newline at end of file