From f51c528bbf68d52b3724c65597291ac4839b5e40 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sun, 15 Mar 2015 17:57:15 -0400 Subject: [PATCH] Added recipes for new v8 content --- .../client/gui/GuiOredictionificator.java | 6 +- .../gui/GuiOredictionificatorFilter.java | 4 +- .../mekanism/client/sound/PlayerSound.java | 7 +- .../java/mekanism/client/sound/Sound.java | 4 +- .../java/mekanism/common/LaserManager.java | 94 ------------------- src/main/java/mekanism/common/Mekanism.java | 14 ++- .../common/network/PacketNewFilter.java | 2 +- .../generators/common/MekanismGenerators.java | 17 ++++ 8 files changed, 42 insertions(+), 106 deletions(-) delete mode 100644 src/main/java/mekanism/common/LaserManager.java diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index 94f414fce..d239caf1c 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -118,7 +118,7 @@ public class GuiOredictionificator extends GuiMekanism GL11.glPopMatrix(); }*/ - fontRendererObj.drawString(MekanismUtils.localize("gui.filter"), 78, yStart + 2, 0x404040); + fontRendererObj.drawString(MekanismUtils.localize("gui.filter"), 32, yStart + 2, 0x404040); } } @@ -146,14 +146,14 @@ public class GuiOredictionificator extends GuiMekanism if(tileEntity.filters.get(getFilterIndex()+i) != null) { int yStart = i*22 + 18; - boolean mouseOver = xAxis >= 56 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22; + boolean mouseOver = xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22; if(mouseOver) { MekanismRenderer.color(EnumColor.GREY, 3.0F); } - drawTexturedModalRect(guiWidth + 56, guiHeight + yStart, 0, 166, 142, 22); + drawTexturedModalRect(guiWidth + 10, guiHeight + yStart, 0, 230, 142, 22); MekanismRenderer.resetColor(); } diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java index cf1d17279..710fe0ab7 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificatorFilter.java @@ -63,7 +63,7 @@ public class GuiOredictionificatorFilter extends GuiMekanism public void setFilter() { String newFilter = filterText.getText(); - boolean has = true; + boolean has = false; for(String s : possibleFilters) { @@ -125,6 +125,8 @@ public class GuiOredictionificatorFilter extends GuiMekanism filterText = new GuiTextField(fontRendererObj, guiWidth + 33, guiHeight + 48, 96, 12); filterText.setMaxStringLength(TileEntityOredictionificator.MAX_LENGTH); filterText.setFocused(true); + + updateButtons(); } @Override diff --git a/src/main/java/mekanism/client/sound/PlayerSound.java b/src/main/java/mekanism/client/sound/PlayerSound.java index e54ebdf50..cbdcb13f6 100644 --- a/src/main/java/mekanism/client/sound/PlayerSound.java +++ b/src/main/java/mekanism/client/sound/PlayerSound.java @@ -28,19 +28,19 @@ public abstract class PlayerSound extends Sound implements IResettableSound @Override public float getXPosF() { - return (float) player.posX; + return (float)player.posX; } @Override public float getYPosF() { - return (float) player.posY; + return (float)player.posY; } @Override public float getZPosF() { - return (float) player.posZ; + return (float)player.posZ; } public PlayerSound setFadeIn(int fade) @@ -51,7 +51,6 @@ public abstract class PlayerSound extends Sound implements IResettableSound public PlayerSound setFadeOut(int fade) { - fadeOut = Math.min(0, fade); return this; } diff --git a/src/main/java/mekanism/client/sound/Sound.java b/src/main/java/mekanism/client/sound/Sound.java index 86e2e110f..2ea23d890 100644 --- a/src/main/java/mekanism/client/sound/Sound.java +++ b/src/main/java/mekanism/client/sound/Sound.java @@ -18,8 +18,8 @@ import cpw.mods.fml.relauncher.SideOnly; * */ @SideOnly(Side.CLIENT) -public class Sound implements ISound { - +public class Sound implements ISound +{ protected AttenuationType attenuation; protected ResourceLocation sound; diff --git a/src/main/java/mekanism/common/LaserManager.java b/src/main/java/mekanism/common/LaserManager.java deleted file mode 100644 index 9fbc74617..000000000 --- a/src/main/java/mekanism/common/LaserManager.java +++ /dev/null @@ -1,94 +0,0 @@ -package mekanism.common; - -import java.util.List; - -import mekanism.api.Coord4D; -import mekanism.api.MekanismConfig.general; -import mekanism.api.Pos3D; -import mekanism.api.lasers.ILaserReceptor; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public class LaserManager -{ - public static MovingObjectPosition fireLaser(TileEntity from, ForgeDirection direction, double energy, World world) - { - return fireLaser(new Pos3D(from).centre().translate(direction, 0.501), direction, energy, world); - } - - public static MovingObjectPosition fireLaser(Pos3D from, ForgeDirection direction, double energy, World world) - { - Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); - - MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); - - if(mop != null) - { - to = new Pos3D(mop.hitVec); - Coord4D toCoord = new Coord4D(mop.blockX, mop.blockY, mop.blockZ); - TileEntity tile = toCoord.getTileEntity(world); - - if(tile instanceof ILaserReceptor) - { - if(!(((ILaserReceptor)tile).canLasersDig())) - { - ((ILaserReceptor)tile).receiveLaserEnergy(energy, ForgeDirection.getOrientation(mop.sideHit)); - } - } - } - - from.translateExcludingSide(direction, -0.1); - to.translateExcludingSide(direction, 0.1); - - for(Entity e : (List)world.getEntitiesWithinAABB(Entity.class, Pos3D.getAABB(from, to))) - { - if(!e.isImmuneToFire()) e.setFire((int)(energy / 1000)); - } - - return mop; - } - - public static List breakBlock(Coord4D blockCoord, boolean dropAtBlock, World world) - { - List ret = null; - Block blockHit = blockCoord.getBlock(world); - - if(dropAtBlock) - { - blockHit.dropBlockAsItem(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockCoord.getMetadata(world), 0); - } - else { - ret = blockHit.getDrops(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockCoord.getMetadata(world), 0); - } - blockHit.breakBlock(world, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, blockHit, blockCoord.getMetadata(world)); - world.setBlockToAir(blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord); - world.playAuxSFX(2001, blockCoord.xCoord, blockCoord.yCoord, blockCoord.zCoord, Block.getIdFromBlock(blockHit)); - return ret; - } - - public static void fireLaserClient(TileEntity from, ForgeDirection direction, double energy, World world) - { - fireLaserClient(new Pos3D(from).centre().translate(direction, 0.501), direction, energy, world); - } - - public static void fireLaserClient(Pos3D from, ForgeDirection direction, double energy, World world) - { - Pos3D to = from.clone().translate(direction, general.laserRange - 0.002); - MovingObjectPosition mop = world.rayTraceBlocks(Vec3.createVectorHelper(from.xPos, from.yPos, from.zPos), Vec3.createVectorHelper(to.xPos, to.yPos, to.zPos)); - - if(mop != null) - { - to = new Pos3D(mop.hitVec); - } - from.translate(direction, -0.501); - Mekanism.proxy.renderLaser(world, from, to, direction, energy); - } - -} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 73f48b8f6..820702729 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -468,7 +468,7 @@ public class Mekanism " S ", "SES", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 2), new Object[] { - " I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 1), Character.valueOf('C'), "circuitBasic" + " I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 1), Character.valueOf('C'), "circuitElite" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 0), new Object[] { "RCR", "iWi", "RCR", Character.valueOf('R'), "alloyBasic", Character.valueOf('C'), "circuitBasic", Character.valueOf('i'), "ingotIron", Character.valueOf('W'), "plankWood" @@ -479,6 +479,18 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FactoryInstaller, 1, 2), new Object[] { "RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), "circuitElite", Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood" })); + MachineType.OREDICTIONIFICATOR.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3), new Object[] { + "SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.chest + })); + MachineType.LASER.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13), new Object[] { + "RE ", "RCD", "RE ", Character.valueOf('R'), "alloyElite", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('D'), "gemDiamond" + })); + MachineType.LASER_AMPLIFIER.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 14), new Object[] { + "SSS", "SED", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('D'), "gemDiamond" + })); + MachineType.LASER_TRACTOR_BEAM.addRecipe(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 15), new Object[] { + "C", "F", Character.valueOf('C'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('F'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 14) + })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { diff --git a/src/main/java/mekanism/common/network/PacketNewFilter.java b/src/main/java/mekanism/common/network/PacketNewFilter.java index b444746fd..42964cac9 100644 --- a/src/main/java/mekanism/common/network/PacketNewFilter.java +++ b/src/main/java/mekanism/common/network/PacketNewFilter.java @@ -126,7 +126,7 @@ public class PacketNewFilter implements IMessageHandler