diff --git a/src/main/java/magicbees/block/BlockVisAuraProvider.java b/src/main/java/magicbees/block/BlockVisAuraProvider.java index 37edea4..bdb0a4e 100644 --- a/src/main/java/magicbees/block/BlockVisAuraProvider.java +++ b/src/main/java/magicbees/block/BlockVisAuraProvider.java @@ -1,5 +1,6 @@ package magicbees.block; +import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityVisAuraProvider; import net.minecraft.block.BlockContainer; @@ -19,7 +20,7 @@ public class BlockVisAuraProvider extends BlockContainer { this.setBlockName("visAuraProvider"); this.setHardness(0.5f); this.setResistance(1.5f); - this.setBlockBounds(0.25f, 0f, 0.25f, 0.75f, 0.5f, 0.75f); + this.setLightLevel(8); } @Override @@ -33,10 +34,16 @@ public class BlockVisAuraProvider extends BlockContainer { return new TileEntityVisAuraProvider(); } + @Override + public int getRenderType() + { + return CommonProxy.RenderIdVisAuraProvider; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = Blocks.glass.getIcon(0, 0); + this.blockIcon = Blocks.planks.getIcon(0, 5); } } diff --git a/src/main/java/magicbees/client/model/ModelEffectJar.java b/src/main/java/magicbees/client/model/ModelEffectJar.java index e33ceb2..0db2696 100644 --- a/src/main/java/magicbees/client/model/ModelEffectJar.java +++ b/src/main/java/magicbees/client/model/ModelEffectJar.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelEffectJar { - public static final String objFile = CommonProxy.MODEL_PATH + "effectJar.obj"; + public static final ResourceLocation objFile = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "effectJar.obj"); public static final ResourceLocation textureLocation = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "jarTexture.png"); public static final ModelEffectJar model = new ModelEffectJar(); @@ -20,7 +20,7 @@ public class ModelEffectJar public ModelEffectJar() { - this.effectJarObj = AdvancedModelLoader.loadModel(new ResourceLocation("magicbees", "model/effectJar.obj")); + this.effectJarObj = AdvancedModelLoader.loadModel(objFile); } public void render() diff --git a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java new file mode 100644 index 0000000..a64a0f7 --- /dev/null +++ b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java @@ -0,0 +1,40 @@ +package magicbees.client.model; + +import org.lwjgl.opengl.GL11; + +import magicbees.main.CommonProxy; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelVisAuraProvider { + public static final ResourceLocation objFile = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraConverter.obj"); + public static final ResourceLocation textureLocation = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraProvider.png"); + + public static final ModelVisAuraProvider model = new ModelVisAuraProvider(); + + private IModelCustom visAuraProviderObj; + + public ModelVisAuraProvider() { + this.visAuraProviderObj = AdvancedModelLoader.loadModel(objFile); + } + + public void render(long tick) { + GL11.glPushMatrix(); + GL11.glRotated(Math.sin(tick * Math.PI * 2 / 80) * 0.7, 0, 1, 0); + GL11.glRotated(Math.sin((tick + 25) * Math.PI * 2 / 150) * 0.75, 0.5, 0, 0.5); + GL11.glTranslated(Math.sin(tick * Math.PI * 2 / 1000) * 0.025, 0, Math.sin((tick + 30) * Math.PI * 2 / 650) * 0.03); + float red = (float)(Math.sin(tick * Math.PI * 2 / 130) * 0.2 + 0.8); + float green = (float)(Math.cos((tick + 2) * Math.PI * 2 / 140) * 0.2 + 0.8); + float blue = (float)(Math.sin((tick + 5) * Math.PI * 2 / 99) * 0.2 + 0.8); + GL11.glColor3f(red, green, blue); + this.visAuraProviderObj.renderPart("centre"); + GL11.glPopMatrix(); + + GL11.glColor3f(1f, 1f, 1f); + this.visAuraProviderObj.renderPart("frame"); + } +} diff --git a/src/main/java/magicbees/client/render/EffectJarRenderer.java b/src/main/java/magicbees/client/render/RendererEffectJar.java similarity index 92% rename from src/main/java/magicbees/client/render/EffectJarRenderer.java rename to src/main/java/magicbees/client/render/RendererEffectJar.java index 79ad4bf..c28b24f 100644 --- a/src/main/java/magicbees/client/render/EffectJarRenderer.java +++ b/src/main/java/magicbees/client/render/RendererEffectJar.java @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -public class EffectJarRenderer extends TileEntitySpecialRenderer implements IItemRenderer +public class RendererEffectJar extends TileEntitySpecialRenderer implements IItemRenderer { - public static EffectJarRenderer instance = new EffectJarRenderer(); + public static RendererEffectJar instance = new RendererEffectJar(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) diff --git a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java new file mode 100644 index 0000000..75353e6 --- /dev/null +++ b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java @@ -0,0 +1,50 @@ +package magicbees.client.render; + +import magicbees.client.model.ModelVisAuraProvider; +import magicbees.tileentity.TileEntityVisAuraProvider; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.FMLClientHandler; + +public class RendererVisAuraProvider extends TileEntitySpecialRenderer implements IItemRenderer { + public static RendererVisAuraProvider instance = new RendererVisAuraProvider(); + + @Override + public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float tick) { + if (entity instanceof TileEntityVisAuraProvider) { + this.doRender(x, y, z, 1f, entity.getWorldObj().getTotalWorldTime()); + } + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + doRender(0, 0, 0, 1f, 0); + } + + private void doRender(double x, double y, double z, float scale, long tick) { + GL11.glPushMatrix(); + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(x, y, z); + + FMLClientHandler.instance().getClient().renderEngine.bindTexture(ModelVisAuraProvider.textureLocation); + ModelVisAuraProvider.model.render(tick); + + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/magicbees/main/ClientProxy.java b/src/main/java/magicbees/main/ClientProxy.java index 911c554..f8f9c2e 100644 --- a/src/main/java/magicbees/main/ClientProxy.java +++ b/src/main/java/magicbees/main/ClientProxy.java @@ -1,13 +1,15 @@ package magicbees.main; +import magicbees.client.render.RendererEffectJar; +import magicbees.client.render.RendererVisAuraProvider; +import magicbees.tileentity.TileEntityEffectJar; +import magicbees.tileentity.TileEntityVisAuraProvider; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import magicbees.client.render.EffectJarRenderer; -import magicbees.tileentity.TileEntityEffectJar; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy @@ -18,7 +20,11 @@ public class ClientProxy extends CommonProxy super.registerRenderers(); RenderIdEffectJar = RenderingRegistry.getNextAvailableRenderId(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.effectJar), EffectJarRenderer.instance); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, EffectJarRenderer.instance); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.effectJar), RendererEffectJar.instance); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, RendererEffectJar.instance); + + RenderIdVisAuraProvider = RenderingRegistry.getNextAvailableRenderId(); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.visAuraProvider), RendererVisAuraProvider.instance); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVisAuraProvider.class, RendererVisAuraProvider.instance); } } diff --git a/src/main/java/magicbees/main/CommonProxy.java b/src/main/java/magicbees/main/CommonProxy.java index 1d8581b..95bd6ab 100644 --- a/src/main/java/magicbees/main/CommonProxy.java +++ b/src/main/java/magicbees/main/CommonProxy.java @@ -30,6 +30,7 @@ public class CommonProxy public static final String GUI_PATH = TEXTURE_PATH + "gui/"; public static int RenderIdEffectJar; + public static int RenderIdVisAuraProvider; public void registerRenderers() { } diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 9e89cae..875c3d2 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -50,7 +50,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; - private static int CHARGE_TIME_MUTATION = 1200; + private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 8; + private static int CHARGE_TIME_MUTATION = 850; private static int CHARGE_TIME_DEATH = 400; private static int CHARGE_TIME_PRODUCTION = 300; @@ -698,7 +699,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } } - private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 12; private void findAuraProvider() { if (worldObj.getTotalWorldTime() % 10 != 0) { return; diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java index 7a63524..028cf10 100644 --- a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -16,7 +16,7 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar int currentDeathCharges; int currentProductionCharges; - private static final int VIS_PER_CHARGE = 10; + private static final int VIS_PER_CHARGE = 8; private static Aspect ASPECT_MUTATION = Aspect.WATER; private static Aspect ASPECT_DEATH = Aspect.ENTROPY; private static Aspect ASPECT_PRODUCTION = Aspect.AIR; diff --git a/src/main/resources/assets/magicbees/model/visAuraConverter.obj b/src/main/resources/assets/magicbees/model/visAuraConverter.obj new file mode 100644 index 0000000..3fc3271 --- /dev/null +++ b/src/main/resources/assets/magicbees/model/visAuraConverter.obj @@ -0,0 +1,204 @@ +# Blender v2.61 (sub 0) OBJ File: 'vis aura converter.blend' +# www.blender.org +o centre +v 0.054523 0.500000 0.504520 +v 0.500000 0.500000 0.949997 +v 0.500000 0.500000 0.059043 +v 0.945477 0.500000 0.504520 +v 0.500000 0.905000 0.504520 +v 0.500000 0.095000 0.504520 +vt 0.500000 0.625000 +vt 1.000000 0.312500 +vt 0.926953 0.782642 +vt 0.693306 0.646921 +vt 0.979384 0.489453 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.769790 0.501479 +vt 0.468750 0.000000 +vt 0.000000 0.250000 +vt 0.000000 0.000000 +vt 0.255720 0.132285 +vt 0.437500 0.468750 +vt 0.000000 0.625000 +vt 0.556041 0.266028 +s off +f 6/1 1/2 3/3 +f 3/4 1/5 5/6 +f 5/7 1/8 2/9 +f 2/9 1/2 6/1 +f 4/10 5/11 2/12 +f 6/1 4/10 2/9 +f 3/13 5/14 4/10 +f 6/1 3/15 4/10 +o frame +v 0.250000 0.000000 1.004520 +v 0.250000 0.000000 0.754520 +v 0.750000 0.000000 0.754520 +v 0.750000 0.000000 1.004520 +v 0.250000 0.250000 1.004520 +v 0.000000 0.250000 1.004520 +v 0.000000 0.000000 1.004520 +v 0.750000 0.750000 1.004520 +v 1.000000 0.750000 1.004520 +v 1.000000 1.000000 1.004520 +v 0.750000 1.000000 1.004520 +v 0.250000 0.750000 1.004520 +v 0.000000 0.750000 1.004520 +v 0.750000 1.000000 0.754520 +v 1.000000 1.000000 0.754520 +v 0.250000 1.000000 1.004520 +v 0.000000 1.000000 1.004520 +v 0.000000 0.750000 0.754520 +v 0.000000 1.000000 0.754520 +v 1.000000 0.250000 0.254520 +v 1.000000 0.000000 0.254520 +v 1.000000 0.000000 0.004520 +v 1.000000 0.250000 0.004520 +v 1.000000 1.000000 0.254520 +v 1.000000 0.750000 0.254520 +v 1.000000 0.750000 0.004520 +v 1.000000 1.000000 0.004520 +v 0.000000 0.750000 0.254520 +v 0.000000 1.000000 0.254520 +v 0.000000 1.000000 0.004520 +v 0.000000 0.750000 0.004520 +v 0.000000 0.250000 0.004520 +v 0.250000 0.250000 0.004520 +v 0.250000 0.000000 0.004520 +v 0.000000 0.000000 0.004520 +v 0.250000 1.000000 0.004520 +v 0.750000 1.000000 0.004520 +v 0.750000 1.000000 0.254520 +v 0.250000 1.000000 0.254520 +v 0.750000 0.000000 0.004520 +v 0.750000 0.250000 0.004520 +v 0.250000 0.750000 0.004520 +v 0.250000 0.750000 0.254520 +v 0.250000 0.000000 0.254520 +v 0.000000 0.000000 0.254520 +v 0.000000 0.250000 0.254520 +v 0.750000 0.750000 0.254520 +v 0.750000 0.750000 0.004520 +v 0.750000 0.250000 0.254520 +v 0.250000 0.250000 0.254520 +v 0.750000 0.000000 0.254520 +v 0.000000 0.250000 0.754520 +v 0.000000 0.000000 0.754520 +v 1.000000 0.000000 0.754520 +v 1.000000 0.000000 1.004520 +v 0.750000 0.750000 0.754520 +v 0.750000 0.250000 1.004520 +v 1.000000 0.250000 1.004520 +v 1.000000 0.250000 0.754520 +v 1.000000 0.750000 0.754520 +v 0.250000 1.000000 0.754520 +v 0.250000 0.750000 0.754520 +v 0.750000 0.250000 0.754520 +v 0.250000 0.250000 0.754520 +vt 0.125000 0.875000 +vt 0.125000 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.875000 +vt 0.500000 1.000000 +vt 0.500000 0.875000 +vt 0.000000 0.625000 +vt 0.125000 0.625000 +vt 0.125000 0.750000 +vt 0.000000 0.750000 +vt 0.375000 0.750000 +vt 0.375000 0.625000 +vt 0.500000 0.625000 +vt 0.500000 0.750000 +vt 0.000000 1.000000 +vt 0.000000 0.875000 +vt 0.750000 1.000000 +vt 0.750000 0.875000 +vt 0.625000 1.000000 +vt 0.750000 0.750000 +vt 0.625000 0.750000 +vt 0.562500 1.000000 +vt 0.687500 1.000000 +vt 0.687500 0.750000 +vt 0.562500 0.750000 +vt 0.750000 0.906250 +vt 0.500000 0.906250 +vt 0.593750 1.000000 +vt 0.593750 0.750000 +vt 0.750000 0.812500 +vt 0.750000 0.937500 +vt 0.500000 0.937500 +vt 0.500000 0.812500 +s off +f 7/16 8/17 9/18 10/19 +f 13/20 7/18 11/19 12/21 +f 14/20 15/18 16/19 17/21 +f 12/17 11/16 18/19 19/18 +f 20/22 17/23 16/24 21/25 +f 19/26 18/27 22/28 23/29 +f 24/17 19/30 23/31 25/16 +f 26/20 27/18 28/19 29/21 +f 30/28 31/29 32/26 33/27 +f 34/28 35/29 36/26 37/27 +f 38/26 39/29 40/21 41/19 +f 42/16 45/17 44/18 43/19 +f 46/16 47/31 29/25 28/24 +f 39/24 38/16 37/19 48/26 +f 48/31 37/25 36/24 42/16 +f 50/19 51/18 41/20 40/21 +f 51/24 52/16 38/31 41/25 +f 39/21 56/20 55/32 47/33 +f 12/26 58/29 59/21 13/19 +f 8/29 7/21 13/19 59/26 +f 31/34 53/32 55/35 26/36 +f 10/25 9/24 60/16 61/31 +f 63/24 64/16 15/19 14/26 +f 65/16 64/31 61/25 60/24 +f 63/30 10/31 61/16 64/17 +f 15/24 66/25 21/22 16/23 +f 22/19 67/21 25/20 23/18 +f 67/16 22/24 17/26 20/19 +f 60/16 9/17 57/18 27/19 +f 25/27 67/26 45/24 35/23 +f 20/18 21/19 30/16 44/17 +f 57/19 50/16 40/17 46/18 +f 27/17 57/30 46/31 28/16 +f 35/20 45/18 42/19 36/21 +f 44/16 30/17 33/30 43/31 +f 8/26 59/27 51/23 50/24 +f 29/26 47/19 54/16 32/24 +f 32/20 54/18 43/19 33/21 +f 65/37 69/38 62/39 66/40 +f 70/20 68/29 18/36 11/34 +f 68/21 49/33 45/32 67/20 +f 56/29 39/20 48/34 49/36 +f 8/24 50/26 56/27 70/23 +f 34/41 49/32 68/20 24/42 +f 52/43 56/20 49/29 34/44 +f 24/35 68/36 70/34 58/32 +f 58/35 70/33 56/21 52/29 +f 63/20 14/29 62/36 69/34 +f 69/16 55/19 57/18 9/17 +f 20/20 44/32 53/33 62/21 +f 53/39 54/44 47/43 55/38 +f 26/35 55/33 69/21 65/29 +f 66/21 62/20 53/32 31/33 +f 50/24 57/26 55/27 56/23 +f 53/35 44/33 45/21 49/29 +f 54/45 53/46 49/47 48/48 +f 70/24 69/26 9/27 8/23 +f 68/35 67/33 20/21 62/29 +f 18/21 68/20 62/32 14/33 +f 63/46 69/45 70/48 11/47 +f 17/26 22/24 18/23 14/27 +f 11/16 7/17 10/18 63/19 +f 65/18 60/17 27/16 26/19 +f 15/19 64/16 65/17 66/18 +f 31/26 26/24 29/16 32/19 +f 31/26 30/27 21/23 66/24 +f 43/19 54/18 48/17 42/16 +f 40/24 39/16 47/19 46/26 +f 34/19 37/26 38/24 52/16 +f 24/26 58/24 12/16 19/19 +f 35/23 34/24 24/26 25/27 +f 52/16 51/17 59/18 58/19 diff --git a/src/main/resources/assets/magicbees/model/visAuraProvider.png b/src/main/resources/assets/magicbees/model/visAuraProvider.png new file mode 100644 index 0000000..48b9909 Binary files /dev/null and b/src/main/resources/assets/magicbees/model/visAuraProvider.png differ