From 64b1e725d429c321a2157a158304a8803da4c28d Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 8 Nov 2014 20:40:43 +0000 Subject: [PATCH] Terrasteel revamp. --- .../client/core/helper/ShaderHelper.java | 2 + .../client/core/proxy/ClientProxy.java | 8 +- .../botania/client/lib/LibResources.java | 1 + .../render/tile/RenderTileTerraPlate.java | 85 +++++++ .../botania/common/block/BlockTerraPlate.java | 65 ++++++ .../botania/common/block/ModBlocks.java | 4 + .../common/block/tile/TileTerraPlate.java | 221 ++++++++++++++++++ .../core/handler/CommonTickHandler.java | 2 + .../handler/TerrasteelCraftingHandler.java | 1 + .../common/core/proxy/CommonProxy.java | 2 - .../common/crafting/ModCraftingRecipes.java | 13 ++ .../botania/common/lexicon/LexiconData.java | 2 +- .../common/lexicon/page/PageTerrasteel.java | 43 ++-- .../botania/common/lib/LibBlockNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 7 +- .../botania/shader/terra_plate_rune.frag | 17 ++ .../botania/textures/blocks/terraPlate0.png | Bin 0 -> 3192 bytes .../botania/textures/blocks/terraPlate1.png | Bin 0 -> 3194 bytes .../botania/textures/blocks/terraPlate2.png | Bin 0 -> 2896 bytes .../textures/blocks/terraPlateOverlay.png | Bin 0 -> 4291 bytes 20 files changed, 434 insertions(+), 40 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java create mode 100644 src/main/java/vazkii/botania/common/block/BlockTerraPlate.java create mode 100644 src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java create mode 100644 src/main/resources/assets/botania/shader/terra_plate_rune.frag create mode 100644 src/main/resources/assets/botania/textures/blocks/terraPlate0.png create mode 100644 src/main/resources/assets/botania/textures/blocks/terraPlate1.png create mode 100644 src/main/resources/assets/botania/textures/blocks/terraPlate2.png create mode 100644 src/main/resources/assets/botania/textures/blocks/terraPlateOverlay.png diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index fa3a31351..858ff3c68 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -40,6 +40,7 @@ public final class ShaderHelper { public static int doppleganger = 0; public static int halo = 0; public static int dopplegangerBar = 0; + public static int terraPlateRune = 0; public static void initShaders() { if(!useShaders()) @@ -51,6 +52,7 @@ public final class ShaderHelper { doppleganger = createProgram(LibResources.SHADER_DOPLLEGANGER_VERT, LibResources.SHADER_DOPLLEGANGER_FRAG); halo = createProgram(null, LibResources.SHADER_HALO_FRAG); dopplegangerBar = createProgram(null, LibResources.SHADER_DOPLLEGANGER_BAR_FRAG); + terraPlateRune = createProgram(null, LibResources.SHADER_TERRA_PLATE_RUNE_FRAG); } public static void useShader(int shader, ShaderCallback callback) { diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index eb00ee3a7..b0882bac0 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -23,8 +23,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.util.StringTranslate; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; import net.minecraftforge.client.MinecraftForgeClient; @@ -75,6 +73,7 @@ import vazkii.botania.client.render.tile.RenderTileSkullOverride; import vazkii.botania.client.render.tile.RenderTileSpawnerClaw; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.client.render.tile.RenderTileStarfield; +import vazkii.botania.client.render.tile.RenderTileTerraPlate; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; @@ -85,6 +84,7 @@ import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileStarfield; +import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TileSpreader; @@ -103,9 +103,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.ReflectionHelper; public class ClientProxy extends CommonProxy { @@ -168,6 +165,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw()); ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield()); ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery()); + ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate()); if(Loader.instance().getMCVersionString().equals("Minecraft 1.7.10")) ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 3aae30254..124d86a4f 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -114,5 +114,6 @@ public final class LibResources { public static final String SHADER_DOPLLEGANGER_FRAG = PREFIX_SHADER + "doppleganger.frag"; public static final String SHADER_HALO_FRAG = PREFIX_SHADER + "halo.frag"; public static final String SHADER_DOPLLEGANGER_BAR_FRAG = PREFIX_SHADER + "doppleganger_bar.frag"; + public static final String SHADER_TERRA_PLATE_RUNE_FRAG = PREFIX_SHADER + "terra_plate_rune.frag"; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java new file mode 100644 index 000000000..c51ebef0e --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -0,0 +1,85 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 8, 2014, 7:20:26 PM (GMT)] + */ +package vazkii.botania.client.render.tile; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; + +import org.lwjgl.opengl.GL11; + +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.block.BlockEnchanter; +import vazkii.botania.common.block.BlockTerraPlate; +import vazkii.botania.common.block.tile.TileTerraPlate; + +public class RenderTileTerraPlate extends TileEntitySpecialRenderer { + + @Override + public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f) { + TileTerraPlate plate = (TileTerraPlate) tileentity; + + float max = (float) TileTerraPlate.MAX_MANA / 10F; + float alphaMod = (float) Math.min(max, plate.getCurrentMana()) / max; + GL11.glPushMatrix(); + GL11.glTranslated(d0, d1, d2); + + GL11.glRotated(90F, 1F, 0F, 0F); + GL11.glTranslatef(0F, 0F, -3F / 16F - 0.001F); + + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glDisable(GL11.GL_ALPHA_TEST); + float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.6D) * alphaMod; + if(ShaderHelper.useShaders()) + GL11.glColor4f(1F, 1F, 1F, alpha); + else { + int light = 15728880; + int lightmapX = light % 65536; + int lightmapY = light / 65536; + OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); + GL11.glColor4f(0.6F + (float) ((Math.cos((ClientTickHandler.ticksInGame + f) / 6D) + 1D) / 5D), 0.1F, 0.9F, alpha); + } + + Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + + ShaderHelper.useShader(ShaderHelper.terraPlateRune); + renderIcon(0, 0, BlockTerraPlate.overlay, 1, 1, 240); + ShaderHelper.releaseShader(); + + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glDisable(GL11.GL_BLEND); + GL11.glColor4f(1F, 1F, 1F, 1F); + GL11.glPopMatrix(); + } + + public void renderIcon(int par1, int par2, IIcon par3Icon, int par4, int par5, int brightness) { + Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setBrightness(brightness); + tessellator.addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.draw(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/BlockTerraPlate.java new file mode 100644 index 000000000..7bbc1be6c --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockTerraPlate.java @@ -0,0 +1,65 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 8, 2014, 5:25:12 PM (GMT)] + */ +package vazkii.botania.common.block; + +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.block.tile.TileTerraPlate; +import vazkii.botania.common.lib.LibBlockNames; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockTerraPlate extends BlockModContainer { + + public static IIcon overlay; + IIcon[] icons; + + protected BlockTerraPlate() { + super(Material.iron); + setBlockBounds(0F, 0F, 0F, 1F, 3F / 16F, 1F); + setHardness(3F); + setResistance(10F); + setStepSound(soundTypeMetal); + setBlockName(LibBlockNames.TERRA_PLATE); + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public void registerBlockIcons(IIconRegister par1IconRegister) { + icons = new IIcon[4]; + for(int i = 0; i < icons.length; i++) + icons[i] = IconHelper.forBlock(par1IconRegister, this, i); + overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay"); + } + + @Override + public IIcon getIcon(int par1, int par2) { + return icons[Math.min(2, par1)]; + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileTerraPlate(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 9597dac67..c1d23ca96 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -118,6 +118,7 @@ import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.block.tile.TileStarfield; +import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.block.tile.mana.TileDistributor; @@ -180,6 +181,7 @@ public final class ModBlocks { public static Block elfGlass; public static Block brewery; public static Block manaGlass; + public static Block terraPlate; public static Block livingwoodStairs; public static Block livingwoodSlab; @@ -301,6 +303,7 @@ public final class ModBlocks { elfGlass = new BlockElfGlass(); brewery = new BlockBrewery(); manaGlass = new BlockManaGlass(); + terraPlate = new BlockTerraPlate(); livingwoodStairs = new BlockLivingwoodStairs(); livingwoodSlab = new BlockLivingwoodSlab(false); @@ -480,6 +483,7 @@ public final class ModBlocks { registerTile(TileStarfield.class, LibBlockNames.STARFIELD); registerTile(TileRFGenerator.class, LibBlockNames.RF_GENERATOR); registerTile(TileBrewery.class, LibBlockNames.BREWERY); + registerTile(TileTerraPlate.class, LibBlockNames.TERRA_PLATE); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java new file mode 100644 index 000000000..7609703eb --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -0,0 +1,221 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Nov 8, 2014, 5:25:32 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.AxisAlignedBB; +import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.api.mana.spark.ISparkAttachable; +import vazkii.botania.api.mana.spark.ISparkEntity; +import vazkii.botania.api.mana.spark.SparkHelper; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.item.ModItems; + +public class TileTerraPlate extends TileMod implements ISparkAttachable { + + public static final int MAX_MANA = TilePool.MAX_MANA / 2; + private static final int[][] LAPIS_BLOCKS = { + { 1, 0, }, { -1, 0 }, { 0, 1 }, { 0, -1 } + }; + + private static final int[][] LIVINGROCK_BLOCKS = { + { 0, 0 }, { 1, 1 }, { 1, -1 }, { -1, 1 }, { -1, -1 } + }; + + private static final String TAG_MANA = "mana"; + + int mana; + + @Override + public void updateEntity() { + boolean removeMana = true; + + if(hasValidPlatform()) { + List items = getItems(); + if(areItemsValid(items)) { + removeMana = false; + ISparkEntity spark = getAttachedSpark(); + if(spark != null) { + List sparkEntities = SparkHelper.getSparksAround(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); + for(ISparkEntity otherSpark : sparkEntities) { + if(spark == otherSpark) + continue; + + if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) + otherSpark.registerTransfer(spark); + } + } + if(mana > 0) + doParticles(); + + if(mana >= MAX_MANA) { + EntityItem item = items.get(0); + for(EntityItem otherItem : items) + if(otherItem != item) + otherItem.setDead(); + else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4)); + item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F); + mana = 0; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } + } + + if(removeMana) + recieveMana(-1000); + } + + void doParticles() { + if(worldObj.isRemote) { + int ticks = (int) (100.0 * ((double) getCurrentMana() / (double) MAX_MANA)); + + int totalSpiritCount = 3; + double tickIncrement = 360D / totalSpiritCount; + + int speed = 5; + double wticks = ticks * speed - tickIncrement; + + double r = Math.sin((ticks - 100) / 10D) * 2; + double g = Math.sin(wticks * Math.PI / 180 * 0.55); + + for(int i = 0; i < totalSpiritCount; i++) { + double x = (int) xCoord + Math.sin(wticks * Math.PI / 180) * r + 0.5; + double y = (int) yCoord + 0.25 + Math.abs(r) * 0.7; + double z = (int) zCoord + Math.cos(wticks * Math.PI / 180) * r + 0.5; + + wticks += tickIncrement; + float[] colorsfx = new float[] { + 0F, (float) ticks / (float) 100, 1F - (float) ticks / (float) 100 + }; + Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); + Botania.proxy.wispFX(worldObj, x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + + if(ticks == 100) + for(int j = 0; j < 15; j++) + Botania.proxy.wispFX(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + } + } + } + + List getItems() { + return worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1)); + } + + boolean areItemsValid(List items) { + if(items.size() != 3) + return false; + + ItemStack ingot = null; + ItemStack pearl = null; + ItemStack diamond = null; + for(EntityItem item : items) { + ItemStack stack = item.getEntityItem(); + if(stack.getItem() != ModItems.manaResource || stack.stackSize != 1) + return false; + + int meta = stack.getItemDamage(); + if(meta == 0) + ingot = stack; + else if(meta == 1) + pearl = stack; + else if(meta == 2) + diamond = stack; + else return false; + } + + return ingot != null && pearl != null && diamond != null; + } + + boolean hasValidPlatform() { + return checkAll(LAPIS_BLOCKS, Blocks.lapis_block) && checkAll(LIVINGROCK_BLOCKS, ModBlocks.livingrock); + } + + boolean checkAll(int[][] positions, Block block) { + for(int i = 0; i < positions.length; i++) { + int[] positions_ = positions[i]; + if(!checkPlatform(positions_[0], positions_[1], block)) + return false; + } + + return true; + } + + boolean checkPlatform(int xOff, int zOff, Block block) { + return worldObj.getBlock(xCoord + xOff, yCoord - 1, zOff + zCoord) == block; + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setInteger(TAG_MANA, mana); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + mana = cmp.getInteger(TAG_MANA); + } + + @Override + public int getCurrentMana() { + return mana; + } + + @Override + public boolean isFull() { + return mana >= MAX_MANA; + } + + @Override + public void recieveMana(int mana) { + this.mana = Math.max(0, Math.min(MAX_MANA, this.mana + mana)); + } + + @Override + public boolean canRecieveManaFromBursts() { + return true; + } + + @Override + public boolean canAttachSpark(ItemStack stack) { + return true; + } + + @Override + public void attachSpark(ISparkEntity entity) { + // NO-OP + } + + @Override + public ISparkEntity getAttachedSpark() { + List sparks = worldObj.getEntitiesWithinAABB(ISparkEntity.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord + 1, zCoord, xCoord + 1, yCoord + 2, zCoord + 1)); + if(sparks.size() == 1) { + Entity e = (Entity) sparks.get(0); + return (ISparkEntity) e; + } + + return null; + } + + @Override + public boolean areIncomingTranfersDone() { + return !areItemsValid(getItems()); + } + +} diff --git a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java index de32f6ecb..ac61d40c0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -25,6 +25,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +// This is legacy code, it used to be used for the old terrasteel crafting +// mechanic. For the new one check TileTerraPlate public final class CommonTickHandler { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java index 2efbf8727..cf14a2c47 100644 --- a/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java @@ -26,6 +26,7 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; +// This is legacy code and is no longer used. Check out TileTerraPlate instead. public final class TerrasteelCraftingHandler { private static final String TAG_TIME = "Botania-CraftingTime"; diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index deaced743..aeb26dc87 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -95,8 +95,6 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new SheddingHandler()); MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler()); - FMLCommonHandler.instance().bus().register(new CommonTickHandler()); - FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); if(Botania.bcTriggersLoaded) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 9d9afa6b8..b60e30869 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -201,6 +201,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeFlask; public static IRecipe recipeBrewery; public static IRecipe recipeBloodPendant; + public static IRecipe recipeTerraPlate; public static void init() { // Lexicon Recipe @@ -1274,6 +1275,18 @@ public final class ModCraftingRecipes { 'D', LibOreDict.MANA_DIAMOND); recipeBloodPendant = BotaniaAPI.getLatestAddedRecipe(); + // Terrestrial Agglomeration Plate Recipe + addOreDictRecipe(new ItemStack(ModBlocks.terraPlate), + "LLL", "0M1", "283", + 'L', new ItemStack(Blocks.lapis_block), + 'M', new ItemStack(ModBlocks.storage), + '0', LibOreDict.RUNE[0], + '1', LibOreDict.RUNE[1], + '2', LibOreDict.RUNE[2], + '3', LibOreDict.RUNE[3], + '8', LibOreDict.RUNE[8]); + recipeTerraPlate = BotaniaAPI.getLatestAddedRecipe(); + // Mana and Terrasteel Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 401e68e14..d01edb34a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -237,7 +237,7 @@ public final class LexiconData { new PageRuneRecipe("13", ModRuneRecipes.recipeLustRune), new PageRuneRecipe("14", ModRuneRecipes.recipeGluttonyRune), new PageRuneRecipe("15", ModRuneRecipes.recipeGreedRune), new PageRuneRecipe("16", ModRuneRecipes.recipeSlothRune), new PageRuneRecipe("17", ModRuneRecipes.recipeWrathRune), new PageRuneRecipe("18", ModRuneRecipes.recipeEnvyRune), new PageRuneRecipe("19", ModRuneRecipes.recipePrideRune)); terrasteel = new BLexiconEntry(LibLexicon.BASICS_TERRASTEEL, categoryBasics); - terrasteel.setLexiconPages(new PageText("0"), new PageTerrasteel("1")); + terrasteel.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeTerraPlate), new PageText("2"), new PageTerrasteel("3")); if(Botania.thaumcraftLoaded) new BLexiconEntry("wrap", categoryBasics).setLexiconPages(new PageText("0")); // lel diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index ae36f8e2b..9aa076584 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -33,13 +33,6 @@ public class PageTerrasteel extends PageRecipe { private static final ResourceLocation terrasteelOverlay = new ResourceLocation(LibResources.GUI_TERRASTEEL_OVERLAY); - int ticksElapsed = 0; - int index = 0; - - static final Block[] blocks = new Block[] { - Blocks.iron_block, Blocks.gold_block, Blocks.emerald_block, Blocks.diamond_block, ModBlocks.storage - }; - public PageTerrasteel(String unlocalizedName) { super(unlocalizedName); } @@ -47,29 +40,31 @@ public class PageTerrasteel extends PageRecipe { @Override @SideOnly(Side.CLIENT) public void renderRecipe(IGuiLexiconEntry gui, int mx, int my) { - Block block = blocks[index]; + Block block1 = ModBlocks.livingrock; + Block block2 = Blocks.lapis_block; + Block block3 = ModBlocks.terraPlate; GL11.glTranslatef(0F, 0F, -10F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 103, new ItemStack(block), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 103, new ItemStack(block1), false); GL11.glTranslatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 106, new ItemStack(block), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 106, new ItemStack(block), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 106, new ItemStack(block2), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 106, new ItemStack(block2), false); GL11.glTranslatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 110, new ItemStack(block), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 14, gui.getTop() + 110, new ItemStack(block), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 13, gui.getTop() + 110, new ItemStack(block), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 110, new ItemStack(block1), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 14, gui.getTop() + 110, new ItemStack(block1), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 13, gui.getTop() + 110, new ItemStack(block1), false); GL11.glTranslatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 114, new ItemStack(block), false); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 114, new ItemStack(block), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 - 6, gui.getTop() + 114, new ItemStack(block2), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 7, gui.getTop() + 114, new ItemStack(block2), false); GL11.glTranslatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 1, gui.getTop() + 117, new ItemStack(block), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8 + 1, gui.getTop() + 117, new ItemStack(block1), false); GL11.glTranslatef(0F, 0F, 5F); - renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(Blocks.beacon), false); + renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 102, new ItemStack(block3), false); GL11.glTranslatef(0F, 0F, -10F); renderItem(gui, gui.getLeft() + gui.getWidth() / 2 - 8, gui.getTop() + 30, new ItemStack(ModItems.manaResource, 1, 4), false); @@ -86,18 +81,6 @@ public class PageTerrasteel extends PageRecipe { GL11.glDisable(GL11.GL_BLEND); } - @Override - @SideOnly(Side.CLIENT) - public void updateScreen() { - if(ticksElapsed % 20 == 0) { - index++; - - if(index == blocks.length) - index = 0; - } - ++ticksElapsed; - } - @Override public void onPageAdded(LexiconEntry entry, int index) { LexiconRecipeMappings.map(new ItemStack(ModItems.manaResource, 1, 4), entry, index); diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 3c02dc3ce..36df7b6ed 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -60,6 +60,7 @@ public final class LibBlockNames { public static final String ELF_GLASS = "elfGlass"; public static final String BREWERY = "brewery"; public static final String MANA_GLASS = "manaGlass"; + public static final String TERRA_PLATE = "terraPlate"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 96b07872b..bcd4adb21 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -492,6 +492,7 @@ tile.botania:rfGenerator.name=Mana Fluxfield tile.botania:elfGlass.name=Alfglass tile.botania:brewery.name=Botanical Brewery tile.botania:manaGlass.name=Managlass +tile.botania:terraPlate.name=Terrestrial Agglomeration Plate # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -905,8 +906,10 @@ botania.page.runeAltar19=The &1Rune of Pride&0. # -- TERRASTEEL botania.entry.terrasteel=Terrasteel -botania.page.terrasteel0=&1Terrasteel&0 is a powerful metal infused with the magic of nature.
Creating this metal proves to not be a short order, in order to create it, toss a &1Manasteel Ingot&0, a &1Mana Pearl&0 and a &1Mana Diamond&0 on top of an &4Active &1Beacon&0. A &1Mana Pool&0 must be present nearby, being at least half full. The infusion will create a single &1Terrasteel Ingot&0. -botania.page.terrasteel1=Creating &1Terrasteel&0 +botania.page.terrasteel0=&1Terrasteel&0 is a complex magical alloy, infused with a great amount of &4Mana&0. Conjuring it proves not to be a small task. For starters, to create it, one would require a &1Terrestrial Agglomeration Plate&0, set on top of a checkerboard pattern of &1Lapis Lazulli Blocks&0 and &1Livingrock&0. &4Mana&0 would need to be provided to this block, &1Sparks&0 would be the most effective way, but &4Bursts&0 work too. +botania.page.terrasteel1=Creating the plate +botania.page.terrasteel2=After the plate is set up and ready to receive &4Mana&0, tossing a single &1Manasteel Ingot, Mana Diamond and Mana Pearl&0 on top of it will begin the infusion.
Picking up any of the items will halt the infusion causing severe &4Mana Loss&0. The infusion uses half a &1Mana Pool&0 total to create a single piece of &4Terrasteel&0, multiple &1Sparks&0 would make it go faster, too. +botania.page.terrasteel3=The pattern for creating &1Terrasteel&0 # -- WRAP botania.entry.wrap=Wrap diff --git a/src/main/resources/assets/botania/shader/terra_plate_rune.frag b/src/main/resources/assets/botania/shader/terra_plate_rune.frag new file mode 100644 index 000000000..d5e882114 --- /dev/null +++ b/src/main/resources/assets/botania/shader/terra_plate_rune.frag @@ -0,0 +1,17 @@ +#version 120 + +uniform sampler2D bgl_RenderedTexture; +uniform int time; // Passed in, see ShaderHelper.java + +void main() { + vec2 texcoord = vec2(gl_TexCoord[0]); + vec4 color = texture2D(bgl_RenderedTexture, texcoord); + float gs = (color.r + color.g + color.b) / 16.0; + + float tx = (texcoord.x + 0.075) * 10; + float ty = (texcoord.y) * 10; + float g = ((sin((time + sin(tx) * 250 + sin(ty) * 50) / 6.0) + 1.0) * 0.5 + 0.5) / 5.0; + float b = ((cos((time + sin(tx) * 50 + sin(ty) * 100) / 6.0) + 1.0) * 0.5 + 0.5) / 5.0; + + gl_FragColor = vec4(gs - 0.1, gs + g, gs + b, color.a * gl_Color.a * 1.4); +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlate0.png b/src/main/resources/assets/botania/textures/blocks/terraPlate0.png new file mode 100644 index 0000000000000000000000000000000000000000..938275bf079f7a62d30da9b06cf13a21883a1896 GIT binary patch literal 3192 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlate2.png b/src/main/resources/assets/botania/textures/blocks/terraPlate2.png new file mode 100644 index 0000000000000000000000000000000000000000..39302f360feb5592c8f5fb06bf71320c9176df1d GIT binary patch literal 2896 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