mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
<1500 errors
This commit is contained in:
1 parent
1f33df57fa
commit
c6a09b5658
433 files changed
+2967
-1474
No files matched your search
@@ -19,10 +19,12 @@ public class TileEnergyHandler extends TileEntity implements IEnergyHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound nbt) {
|
||||
public NBTTagCompound writeToNBT(NBTTagCompound nbt) {
|
||||
|
||||
super.writeToNBT(nbt);
|
||||
storage.writeToNBT(nbt);
|
||||
|
||||
return nbt;
|
||||
}
|
||||
|
||||
/* IEnergyConnection */
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package mekanism.api;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.util.math.ChunkPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
|
||||
@@ -62,7 +63,7 @@ public class Chunk3D
|
||||
*/
|
||||
public boolean exists(World world)
|
||||
{
|
||||
return world.getChunkProvider().chunkExists(xCoord, zCoord);
|
||||
return world.getChunkProvider().getLoadedChunk(xCoord, zCoord) != null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -79,9 +80,9 @@ public class Chunk3D
|
||||
* Returns this Chunk3D in the Minecraft-based ChunkCoordIntPair format.
|
||||
* @return this Chunk3D as a ChunkCoordIntPair
|
||||
*/
|
||||
public ChunkCoordIntPair toPair()
|
||||
public ChunkPos getPos()
|
||||
{
|
||||
return new ChunkCoordIntPair(xCoord, zCoord);
|
||||
return new ChunkPos(xCoord, zCoord);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
@@ -59,7 +60,7 @@ public class Coord4D
|
||||
yCoord = (int)entity.posY;
|
||||
zCoord = (int)entity.posZ;
|
||||
|
||||
dimensionId = entity.worldObj.provider.getDimensionId();
|
||||
dimensionId = entity.worldObj.provider.getDimension();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -80,10 +81,10 @@ public class Coord4D
|
||||
|
||||
public Coord4D(BlockPos pos, World world)
|
||||
{
|
||||
this(pos.getX(), pos.getY(), pos.getZ(), world.provider.getDimensionId());
|
||||
this(pos.getX(), pos.getY(), pos.getZ(), world.provider.getDimension());
|
||||
}
|
||||
|
||||
public Coord4D(MovingObjectPosition mop, World world)
|
||||
public Coord4D(RayTraceResult mop, World world)
|
||||
{
|
||||
this(mop.getBlockPos(), world);
|
||||
}
|
||||
@@ -230,7 +231,7 @@ public class Coord4D
|
||||
{
|
||||
IBlockState state = getBlockState(world);
|
||||
|
||||
if(state == null || state == Blocks.air)
|
||||
if(state == null || state == Blocks.AIR)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -350,7 +351,7 @@ public class Coord4D
|
||||
*/
|
||||
public boolean exists(World world)
|
||||
{
|
||||
return world.getChunkProvider() == null || world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4);
|
||||
return world.getChunkProvider() == null || world.getChunkProvider().getLoadedChunk(xCoord >> 4, zCoord >> 4) != null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -398,7 +399,7 @@ public class Coord4D
|
||||
*/
|
||||
public AxisAlignedBB getBoundingBox()
|
||||
{
|
||||
return AxisAlignedBB.fromBounds(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1);
|
||||
return new AxisAlignedBB(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,6 +2,8 @@ package mekanism.api;
|
||||
|
||||
import net.minecraft.util.IStringSerializable;
|
||||
|
||||
import com.sun.imageio.plugins.common.I18N;
|
||||
|
||||
/**
|
||||
* Simple color enum for adding colors to in-game GUI strings of text.
|
||||
* @author AidanBrady
|
||||
@@ -58,12 +60,12 @@ public enum EnumColor implements IStringSerializable
|
||||
*/
|
||||
public String getLocalizedName()
|
||||
{
|
||||
return StatCollector.translateToLocal("color." + unlocalizedName);
|
||||
return I18N.getString("color." + unlocalizedName);
|
||||
}
|
||||
|
||||
public String getDyeName()
|
||||
{
|
||||
return StatCollector.translateToLocal("dye." + unlocalizedName);
|
||||
return I18N.getString("dye." + unlocalizedName);
|
||||
}
|
||||
|
||||
public String getOreDictName()
|
||||
|
||||
@@ -53,7 +53,7 @@ public class Range4D
|
||||
|
||||
public static Range4D getChunkRange(EntityPlayer player)
|
||||
{
|
||||
int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().getViewDistance();
|
||||
int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getViewDistance();
|
||||
|
||||
return new Range4D(new Chunk3D(player)).expandChunks(radius);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
|
||||
import com.sun.imageio.plugins.common.I18N;
|
||||
|
||||
/**
|
||||
* Gas - a class used to set specific properties of gasses when used or seen in-game.
|
||||
* @author aidancbrady
|
||||
@@ -96,7 +98,7 @@ public class Gas
|
||||
*/
|
||||
public String getLocalizedName()
|
||||
{
|
||||
return StatCollector.translateToLocal(getUnlocalizedName());
|
||||
return I18N.getString(getUnlocalizedName());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package mekanism.api.gas;
|
||||
|
||||
import com.sun.imageio.plugins.common.I18N;
|
||||
|
||||
|
||||
public class OreGas extends Gas
|
||||
{
|
||||
@@ -32,6 +34,6 @@ public class OreGas extends Gas
|
||||
|
||||
public String getOreName()
|
||||
{
|
||||
return StatCollector.translateToLocal(oreName);
|
||||
return I18N.getString(oreName);
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,8 @@ package mekanism.api.infuse;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import com.sun.imageio.plugins.common.I18N;
|
||||
|
||||
/**
|
||||
* The types of infuse currently available in Mekanism.
|
||||
* @author AidanBrady
|
||||
@@ -42,6 +44,6 @@ public final class InfuseType
|
||||
|
||||
public String getLocalizedName()
|
||||
{
|
||||
return StatCollector.translateToLocal(unlocalizedName);
|
||||
return I18N.getString(unlocalizedName);
|
||||
}
|
||||
}
|
||||
@@ -267,7 +267,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
|
||||
if(coord.xCoord > maxZ) maxZ = coord.zCoord;
|
||||
}
|
||||
|
||||
return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.getDimensionId());
|
||||
return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.getDimension());
|
||||
}
|
||||
|
||||
public void register()
|
||||
|
||||
@@ -3,6 +3,8 @@ package mekanism.api.transmitters;
|
||||
import mekanism.api.gas.IGasTransmitter;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
import com.sun.imageio.plugins.common.I18N;
|
||||
|
||||
public enum TransmissionType
|
||||
{
|
||||
ENERGY("EnergyNetwork", "Energy"),
|
||||
@@ -32,7 +34,7 @@ public enum TransmissionType
|
||||
|
||||
public String localize()
|
||||
{
|
||||
return StatCollector.translateToLocal("transmission." + getTransmission());
|
||||
return I18N.getString("transmission." + getTransmission());
|
||||
}
|
||||
|
||||
public static boolean checkTransmissionType(ITransmitter sideTile, TransmissionType type)
|
||||
|
||||
@@ -810,7 +810,7 @@ public class ClientProxy extends CommonProxy
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addHitEffects(Coord4D coord, MovingObjectPosition mop)
|
||||
public void addHitEffects(Coord4D coord, RayTraceResult mop)
|
||||
{
|
||||
if(Minecraft.getMinecraft().theWorld != null)
|
||||
{
|
||||
|
||||
@@ -332,7 +332,7 @@ public class GuiMModIDFilter extends GuiMekanism
|
||||
{
|
||||
if(stack.getItem() instanceof ItemBlock)
|
||||
{
|
||||
if(Block.getBlockFromItem(stack.getItem()) != Blocks.bedrock)
|
||||
if(Block.getBlockFromItem(stack.getItem()) != Blocks.BEDROCK)
|
||||
{
|
||||
toUse = stack.copy();
|
||||
toUse.stackSize = 1;
|
||||
|
||||
@@ -238,7 +238,7 @@ public class MekanismRenderer
|
||||
|
||||
public boolean[] renderSides = new boolean[] {true, true, true, true, true, true, false};
|
||||
|
||||
public Block baseBlock = Blocks.sand;
|
||||
public Block baseBlock = Blocks.SAND;
|
||||
|
||||
public final void setBlockBounds(double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos)
|
||||
{
|
||||
@@ -503,7 +503,7 @@ public class MekanismRenderer
|
||||
|
||||
public static ResourceLocation getBlocksTexture()
|
||||
{
|
||||
return TextureMap.locationBlocksTexture;
|
||||
return TextureMap.LOCATION_BLOCKS_TEXTURE;
|
||||
}
|
||||
|
||||
public static interface ICustomBlockIcon
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.VertexBuffer;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
@@ -20,6 +21,7 @@ import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumFacing.Axis;
|
||||
import net.minecraft.util.EnumFacing.AxisDirection;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraft.util.math.Vec3i;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
@@ -35,12 +37,12 @@ import com.google.common.collect.Maps;
|
||||
public class RenderResizableCuboid {
|
||||
protected RenderManager manager = Minecraft.getMinecraft().getRenderManager();
|
||||
|
||||
public static final Vec3 VEC_ONE = vec3(1);
|
||||
public static final Vec3 VEC_ZERO = vec3(0);
|
||||
public static final Vec3 VEC_HALF = vec3(0.5);
|
||||
public static final Vec3d VEC_ONE = vec3(1);
|
||||
public static final Vec3d VEC_ZERO = vec3(0);
|
||||
public static final Vec3d VEC_HALF = vec3(0.5);
|
||||
|
||||
public interface IBlockLocation {
|
||||
Vec3 transformToWorld(Vec3 vec);
|
||||
Vec3d transformToWorld(Vec3d vec);
|
||||
}
|
||||
|
||||
public interface IFacingLocation {
|
||||
@@ -99,7 +101,7 @@ public class RenderResizableCuboid {
|
||||
public static final RenderResizableCuboid INSTANCE = new RenderResizableCuboid();
|
||||
|
||||
/** The AO map assumes that each direction in the world has a different amount of light going towards it. */
|
||||
private static final Map<EnumFacing, Vec3> aoMap = Maps.newEnumMap(EnumFacing.class);
|
||||
private static final Map<EnumFacing, Vec3d> aoMap = Maps.newEnumMap(EnumFacing.class);
|
||||
|
||||
private static final int U_MIN = 0;
|
||||
private static final int U_MAX = 1;
|
||||
@@ -141,15 +143,15 @@ public class RenderResizableCuboid {
|
||||
flips = new int[6];
|
||||
}
|
||||
|
||||
Vec3 textureStart = new Vec3(cube.textureStartX / 16D, cube.textureStartY / 16D, cube.textureStartZ / 16D);
|
||||
Vec3 textureSize = new Vec3(cube.textureSizeX / 16D, cube.textureSizeY / 16D, cube.textureSizeZ / 16D);
|
||||
Vec3 textureOffset = new Vec3(cube.textureOffsetX / 16D, cube.textureOffsetY / 16D, cube.textureOffsetZ / 16D);
|
||||
Vec3 size = new Vec3(cube.sizeX(), cube.sizeY(), cube.sizeZ());
|
||||
Vec3d textureStart = new Vec3d(cube.textureStartX / 16D, cube.textureStartY / 16D, cube.textureStartZ / 16D);
|
||||
Vec3d textureSize = new Vec3d(cube.textureSizeX / 16D, cube.textureSizeY / 16D, cube.textureSizeZ / 16D);
|
||||
Vec3d textureOffset = new Vec3d(cube.textureOffsetX / 16D, cube.textureOffsetY / 16D, cube.textureOffsetZ / 16D);
|
||||
Vec3d size = new Vec3d(cube.sizeX(), cube.sizeY(), cube.sizeZ());
|
||||
|
||||
manager.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
manager.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
|
||||
|
||||
Tessellator tess = Tessellator.getInstance();
|
||||
WorldRenderer wr = tess.getWorldRenderer();
|
||||
VertexBuffer wr = tess.getBuffer();
|
||||
|
||||
GlStateManager.enableAlpha();
|
||||
GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
@@ -168,15 +170,15 @@ public class RenderResizableCuboid {
|
||||
GlStateManager.enableFog();
|
||||
}
|
||||
|
||||
private void renderCuboidFace(WorldRenderer wr, EnumFacing face, TextureAtlasSprite[] sprites, int[] flips, Vec3 textureStart, Vec3 textureSize,
|
||||
Vec3 size, Vec3 textureOffset, EnumShadeArgument shadeTypes, IBlockLocation locationFormula, IFacingLocation faceFormula,
|
||||
private void renderCuboidFace(VertexBuffer wr, EnumFacing face, TextureAtlasSprite[] sprites, int[] flips, Vec3d textureStart, Vec3d textureSize,
|
||||
Vec3d size, Vec3d textureOffset, EnumShadeArgument shadeTypes, IBlockLocation locationFormula, IFacingLocation faceFormula,
|
||||
IBlockAccess access) {
|
||||
int ordinal = face.ordinal();
|
||||
if (sprites[ordinal] == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
Vec3 textureEnd = textureStart.add(textureSize);
|
||||
Vec3d textureEnd = textureStart.add(textureSize);
|
||||
float[] uv = getUVArray(sprites[ordinal], flips[ordinal], face, textureStart, textureEnd);
|
||||
List<RenderInfo> renderInfoList = getRenderInfos(uv, face, size, textureSize, textureOffset);
|
||||
|
||||
@@ -203,19 +205,19 @@ public class RenderResizableCuboid {
|
||||
}
|
||||
}
|
||||
|
||||
public static Vec3 withValue(Vec3 vector, Axis axis, double value) {
|
||||
if (axis == Axis.X) return new Vec3(value, vector.yCoord, vector.zCoord);
|
||||
else if (axis == Axis.Y) return new Vec3(vector.xCoord, value, vector.zCoord);
|
||||
else if (axis == Axis.Z) return new Vec3(vector.xCoord, vector.yCoord, value);
|
||||
public static Vec3d withValue(Vec3d vector, Axis axis, double value) {
|
||||
if (axis == Axis.X) return new Vec3d(value, vector.yCoord, vector.zCoord);
|
||||
else if (axis == Axis.Y) return new Vec3d(vector.xCoord, value, vector.zCoord);
|
||||
else if (axis == Axis.Z) return new Vec3d(vector.xCoord, vector.yCoord, value);
|
||||
else throw new RuntimeException("Was given a null axis! That was probably not intentional, consider this a bug! (Vector = " + vector + ")");
|
||||
}
|
||||
|
||||
private void renderPoint(WorldRenderer wr, EnumFacing face, Axis u, Axis v, double other, RenderInfo ri, boolean minU, boolean minV,
|
||||
private void renderPoint(VertexBuffer wr, EnumFacing face, Axis u, Axis v, double other, RenderInfo ri, boolean minU, boolean minV,
|
||||
IBlockLocation locationFormula, IFacingLocation faceFormula, IBlockAccess access, EnumShadeArgument shadeTypes) {
|
||||
int U_ARRAY = minU ? U_MIN : U_MAX;
|
||||
int V_ARRAY = minV ? V_MIN : V_MAX;
|
||||
|
||||
Vec3 vertex = withValue(VEC_ZERO, u, ri.xyz[U_ARRAY]);
|
||||
Vec3d vertex = withValue(VEC_ZERO, u, ri.xyz[U_ARRAY]);
|
||||
vertex = withValue(vertex, v, ri.xyz[V_ARRAY]);
|
||||
vertex = withValue(vertex, face.getAxis(), other);
|
||||
|
||||
@@ -229,7 +231,7 @@ public class RenderResizableCuboid {
|
||||
if (shadeTypes.isEnabled(EnumShadeType.AMBIENT_OCCLUSION)) {
|
||||
applyLocalAO(wr, faceFormula.transformToWorld(face), locationFormula, access, shadeTypes, vertex);
|
||||
} else if (shadeTypes.isEnabled(EnumShadeType.LIGHT)) {
|
||||
Vec3 transVertex = locationFormula.transformToWorld(vertex);
|
||||
Vec3d transVertex = locationFormula.transformToWorld(vertex);
|
||||
BlockPos pos = convertFloor(transVertex);
|
||||
Block block = access.getBlockState(pos).getBlock();
|
||||
int combindedLight = block.getMixedBrightnessForBlock(access, pos);
|
||||
@@ -239,19 +241,19 @@ public class RenderResizableCuboid {
|
||||
wr.endVertex();
|
||||
}
|
||||
|
||||
public static BlockPos convertFloor(Vec3 vec) {
|
||||
public static BlockPos convertFloor(Vec3d vec) {
|
||||
return new BlockPos(vec.xCoord, vec.yCoord, vec.zCoord);
|
||||
}
|
||||
|
||||
public static Vec3 convert(Vec3i vec3i) {
|
||||
return new Vec3(vec3i.getX(), vec3i.getY(), vec3i.getZ());
|
||||
public static Vec3d convert(Vec3i vec3i) {
|
||||
return new Vec3d(vec3i.getX(), vec3i.getY(), vec3i.getZ());
|
||||
}
|
||||
|
||||
public static Vec3 convert(EnumFacing face) {
|
||||
public static Vec3d convert(EnumFacing face) {
|
||||
if (face == null) {
|
||||
return VEC_ZERO;
|
||||
}
|
||||
return new Vec3(face.getFrontOffsetX(), face.getFrontOffsetY(), face.getFrontOffsetZ());
|
||||
return new Vec3d(face.getFrontOffsetX(), face.getFrontOffsetY(), face.getFrontOffsetZ());
|
||||
|
||||
}
|
||||
|
||||
@@ -267,8 +269,8 @@ public class RenderResizableCuboid {
|
||||
return faces;
|
||||
}
|
||||
|
||||
private void applyLocalAO(WorldRenderer wr, EnumFacing face, IBlockLocation locationFormula, IBlockAccess access, EnumShadeArgument shadeTypes,
|
||||
Vec3 vertex) {
|
||||
private void applyLocalAO(VertexBuffer wr, EnumFacing face, IBlockLocation locationFormula, IBlockAccess access, EnumShadeArgument shadeTypes,
|
||||
Vec3d vertex) {
|
||||
// This doesn't work. At all.
|
||||
boolean allAround = false;
|
||||
|
||||
@@ -278,7 +280,7 @@ public class RenderResizableCuboid {
|
||||
float[] colorMultiplier = new float[numPositions];
|
||||
double[] distances = new double[numPositions];
|
||||
double totalDist = 0;
|
||||
Vec3 transVertex = locationFormula.transformToWorld(vertex);
|
||||
Vec3d transVertex = locationFormula.transformToWorld(vertex);
|
||||
BlockPos pos = convertFloor(transVertex);
|
||||
Block block = access.getBlockState(pos).getBlock();
|
||||
int combindedLight = block.getMixedBrightnessForBlock(access, pos);
|
||||
@@ -291,7 +293,7 @@ public class RenderResizableCuboid {
|
||||
int index = 0;
|
||||
EnumFacing[] testArray = allAround ? EnumFacing.values() : getNeighbours(face);
|
||||
for (EnumFacing otherFace : testArray) {
|
||||
Vec3 nearestOther = vertex.add(convert(otherFace));
|
||||
Vec3d nearestOther = vertex.add(convert(otherFace));
|
||||
pos = convertFloor(locationFormula.transformToWorld(nearestOther));
|
||||
block = access.getBlockState(pos).getBlock();
|
||||
combindedLight = block.getMixedBrightnessForBlock(access, pos);
|
||||
@@ -322,7 +324,7 @@ public class RenderResizableCuboid {
|
||||
wr.lightmap(capBlockLight, capSkyLight);
|
||||
}
|
||||
|
||||
Vec3 color;
|
||||
Vec3d color;
|
||||
if (shadeTypes.isEnabled(EnumShadeType.FACE)) {
|
||||
color = aoMap.get(face);
|
||||
} else {
|
||||
@@ -332,19 +334,19 @@ public class RenderResizableCuboid {
|
||||
setWorldRendererRGB(wr, color);
|
||||
}
|
||||
|
||||
public static void setWorldRendererRGB(WorldRenderer wr, Vec3 color) {
|
||||
public static void setWorldRendererRGB(VertexBuffer wr, Vec3d color) {
|
||||
wr.color((float) color.xCoord, (float) color.yCoord, (float) color.zCoord, 1f);
|
||||
}
|
||||
|
||||
public static Vec3 vec3(double value) {
|
||||
return new Vec3(value, value, value);
|
||||
public static Vec3d vec3(double value) {
|
||||
return new Vec3d(value, value, value);
|
||||
}
|
||||
|
||||
public static Vec3 multiply(Vec3 vec, double multiple) {
|
||||
return new Vec3(vec.xCoord * multiple, vec.yCoord * multiple, vec.zCoord * multiple);
|
||||
public static Vec3d multiply(Vec3d vec, double multiple) {
|
||||
return new Vec3d(vec.xCoord * multiple, vec.yCoord * multiple, vec.zCoord * multiple);
|
||||
}
|
||||
|
||||
public static Vec3 convertMiddle(Vec3i vec3i) {
|
||||
public static Vec3d convertMiddle(Vec3i vec3i) {
|
||||
return convert(vec3i).add(VEC_HALF);
|
||||
}
|
||||
|
||||
@@ -515,7 +517,7 @@ public class RenderResizableCuboid {
|
||||
return uvarray;
|
||||
}
|
||||
|
||||
private float[] getUVArray(TextureAtlasSprite sprite, int flips, EnumFacing face, Vec3 start, Vec3 end) {
|
||||
private float[] getUVArray(TextureAtlasSprite sprite, int flips, EnumFacing face, Vec3d start, Vec3d end) {
|
||||
Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X;
|
||||
Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y;
|
||||
|
||||
@@ -538,7 +540,7 @@ public class RenderResizableCuboid {
|
||||
return uvarray;
|
||||
}
|
||||
|
||||
private List<RenderInfo> getRenderInfos(float[] uv, EnumFacing face, Vec3 size, Vec3 texSize, Vec3 texOffset) {
|
||||
private List<RenderInfo> getRenderInfos(float[] uv, EnumFacing face, Vec3d size, Vec3d texSize, Vec3d texOffset) {
|
||||
Axis u = face.getAxis() == Axis.X ? Axis.Z : Axis.X;
|
||||
Axis v = face.getAxis() == Axis.Y ? Axis.Z : Axis.Y;
|
||||
|
||||
@@ -552,7 +554,7 @@ public class RenderResizableCuboid {
|
||||
return getRenderInfos(uv, sizeU, sizeV, textureSizeU, textureSizeV, textureOffsetU, textureOffsetV);
|
||||
}
|
||||
|
||||
public static double getValue(Vec3 vector, Axis axis) {
|
||||
public static double getValue(Vec3d vector, Axis axis) {
|
||||
if (axis == Axis.X) return vector.xCoord;
|
||||
else if (axis == Axis.Y) return vector.yCoord;
|
||||
else if (axis == Axis.Z) return vector.zCoord;
|
||||
|
||||
@@ -17,6 +17,7 @@ import mekanism.common.util.MekanismUtils;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.client.particle.Particle;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumParticleTypes;
|
||||
@@ -229,7 +230,7 @@ public class RenderTickHandler
|
||||
|
||||
public void spawnAndSetParticle(EnumParticleTypes s, World world, double x, double y, double z, double velX, double velY, double velZ)
|
||||
{
|
||||
EntityFX fx = null;
|
||||
Particle fx = null;
|
||||
|
||||
if(s.equals(EnumParticleTypes.FLAME))
|
||||
{
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package mekanism.client.render.particle;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.ParticleFlame;
|
||||
import net.minecraft.client.renderer.VertexBuffer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.client.FMLClientHandler;
|
||||
@@ -8,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class EntityJetpackFlameFX extends EntityFlameFX
|
||||
public class EntityJetpackFlameFX extends ParticleFlame
|
||||
{
|
||||
private static Minecraft mc = FMLClientHandler.instance().getClient();
|
||||
|
||||
@@ -26,7 +28,7 @@ public class EntityJetpackFlameFX extends EntityFlameFX
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
{
|
||||
if(particleAge > 0)
|
||||
{
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package mekanism.client.render.particle;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.ParticleSmokeNormal;
|
||||
import net.minecraft.client.renderer.VertexBuffer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.client.FMLClientHandler;
|
||||
@@ -8,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class EntityJetpackSmokeFX extends EntitySmokeFX
|
||||
public class EntityJetpackSmokeFX extends ParticleSmokeNormal
|
||||
{
|
||||
private static Minecraft mc = FMLClientHandler.instance().getClient();
|
||||
|
||||
@@ -26,7 +28,7 @@ public class EntityJetpackSmokeFX extends EntitySmokeFX
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
{
|
||||
if(particleAge > 0)
|
||||
{
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package mekanism.client.render.particle;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.particle.ParticleBubble;
|
||||
import net.minecraft.client.renderer.VertexBuffer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.client.FMLClientHandler;
|
||||
@@ -8,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class EntityScubaBubbleFX extends EntityBubbleFX
|
||||
public class EntityScubaBubbleFX extends ParticleBubble
|
||||
{
|
||||
private static Minecraft mc = FMLClientHandler.instance().getClient();
|
||||
|
||||
@@ -29,7 +31,7 @@ public class EntityScubaBubbleFX extends EntityBubbleFX
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderParticle(WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
public void renderParticle(VertexBuffer worldRendererIn, Entity entityIn, float partialTicks, float p_180434_4_, float p_180434_5_, float p_180434_6_, float p_180434_7_, float p_180434_8_)
|
||||
{
|
||||
if(particleAge > 0)
|
||||
{
|
||||
|
||||
@@ -45,7 +45,7 @@ public class RenderConfigurableMachine<S extends TileEntity & ISideConfiguration
|
||||
|
||||
EntityPlayer player = mc.thePlayer;
|
||||
ItemStack itemStack = player.getCurrentEquippedItem();
|
||||
MovingObjectPosition pos = player.rayTrace(8.0D, 1.0F);
|
||||
RayTraceResult pos = player.rayTrace(8.0D, 1.0F);
|
||||
|
||||
if(pos != null && itemStack != null && itemStack.getItem() instanceof ItemConfigurator && ((ItemConfigurator)itemStack.getItem()).getState(itemStack).isConfigurating())
|
||||
{
|
||||
|
||||
@@ -94,7 +94,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase<PartLogis
|
||||
EntityPlayer player = mc.thePlayer;
|
||||
World world = mc.thePlayer.worldObj;
|
||||
ItemStack itemStack = player.getCurrentEquippedItem();
|
||||
MovingObjectPosition pos = player.rayTrace(8.0D, 1.0F);
|
||||
RayTraceResult pos = player.rayTrace(8.0D, 1.0F);
|
||||
|
||||
if(pos != null && itemStack != null && itemStack.getItem() instanceof ItemConfigurator)
|
||||
{
|
||||
|
||||
@@ -123,6 +123,7 @@ import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -376,7 +377,7 @@ public class CommonProxy implements IGuiProvider
|
||||
/**
|
||||
* Adds block hit effects on the client side.
|
||||
*/
|
||||
public void addHitEffects(Coord4D coord, MovingObjectPosition mop) {}
|
||||
public void addHitEffects(Coord4D coord, RayTraceResult mop) {}
|
||||
|
||||
/**
|
||||
* Does a generic creation animation, starting from the rendering block.
|
||||
@@ -542,7 +543,7 @@ public class CommonProxy implements IGuiProvider
|
||||
{
|
||||
if(player instanceof EntityPlayerMP)
|
||||
{
|
||||
return ((EntityPlayerMP)player).theItemInWorldManager.getBlockReachDistance();
|
||||
return ((EntityPlayerMP)player).interactionManager.getBlockReachDistance();
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -576,10 +577,10 @@ public class CommonProxy implements IGuiProvider
|
||||
{
|
||||
if(general.cardboardSpawners)
|
||||
{
|
||||
MekanismAPI.removeBoxBlacklist(Blocks.mob_spawner, 0);
|
||||
MekanismAPI.removeBoxBlacklist(Blocks.MOB_SPAWNER, 0);
|
||||
}
|
||||
else {
|
||||
MekanismAPI.addBoxBlacklist(Blocks.mob_spawner, 0);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.MOB_SPAWNER, 0);
|
||||
}
|
||||
|
||||
BlockStateMachine.MachineType.updateAllUsages();
|
||||
|
||||
@@ -7,6 +7,7 @@ import java.util.Random;
|
||||
|
||||
import mekanism.common.frequency.FrequencyManager;
|
||||
import mekanism.common.multiblock.MultiblockManager;
|
||||
import net.minecraft.util.math.ChunkPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
|
||||
@@ -17,18 +18,18 @@ public class CommonWorldTickHandler
|
||||
{
|
||||
private static final long maximumDeltaTimeNanoSecs = 16000000; // 16 milliseconds
|
||||
|
||||
private HashMap<Integer, Queue<ChunkCoordIntPair>> chunkRegenMap;
|
||||
private HashMap<Integer, Queue<ChunkPos>> chunkRegenMap;
|
||||
|
||||
public void addRegenChunk(int dimensionId, ChunkCoordIntPair chunkCoord)
|
||||
public void addRegenChunk(int dimensionId, ChunkPos chunkCoord)
|
||||
{
|
||||
if(chunkRegenMap == null)
|
||||
{
|
||||
chunkRegenMap = new HashMap<Integer, Queue<ChunkCoordIntPair>>();
|
||||
chunkRegenMap = new HashMap<Integer, Queue<ChunkPos>>();
|
||||
}
|
||||
|
||||
if(!chunkRegenMap.containsKey(dimensionId))
|
||||
{
|
||||
LinkedList<ChunkCoordIntPair> list = new LinkedList<ChunkCoordIntPair>();
|
||||
LinkedList<ChunkPos> list = new LinkedList<ChunkPos>();
|
||||
list.add(chunkCoord);
|
||||
chunkRegenMap.put(dimensionId, list);
|
||||
}
|
||||
@@ -87,17 +88,17 @@ public class CommonWorldTickHandler
|
||||
return;
|
||||
}
|
||||
|
||||
int dimensionId = world.provider.getDimensionId();
|
||||
int dimensionId = world.provider.getDimension();
|
||||
|
||||
//Credit to E. Beef
|
||||
if(chunkRegenMap.containsKey(dimensionId))
|
||||
{
|
||||
Queue<ChunkCoordIntPair> chunksToGen = chunkRegenMap.get(dimensionId);
|
||||
Queue<ChunkPos> chunksToGen = chunkRegenMap.get(dimensionId);
|
||||
long startTime = System.nanoTime();
|
||||
|
||||
while(System.nanoTime() - startTime < maximumDeltaTimeNanoSecs && !chunksToGen.isEmpty())
|
||||
{
|
||||
ChunkCoordIntPair nextChunk = chunksToGen.poll();
|
||||
ChunkPos nextChunk = chunksToGen.poll();
|
||||
|
||||
if(nextChunk == null)
|
||||
{
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
@@ -30,7 +31,7 @@ public class LaserManager
|
||||
{
|
||||
Pos3D to = from.clone().translate(direction, general.laserRange - 0.002);
|
||||
|
||||
MovingObjectPosition mop = world.rayTraceBlocks(from, to);
|
||||
RayTraceResult mop = world.rayTraceBlocks(from, to);
|
||||
|
||||
if(mop != null)
|
||||
{
|
||||
@@ -100,20 +101,20 @@ public class LaserManager
|
||||
|
||||
blockHit.breakBlock(world, blockCoord.getPos(), state);
|
||||
world.setBlockToAir(blockCoord.getPos());
|
||||
world.playAuxSFX(2001, blockCoord.getPos(), Block.getIdFromBlock(blockHit));
|
||||
world.playEvent(2001, blockCoord.getPos(), Block.getStateId(state));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
public static MovingObjectPosition fireLaserClient(TileEntity from, EnumFacing direction, double energy, World world)
|
||||
public static RayTraceResult fireLaserClient(TileEntity from, EnumFacing direction, double energy, World world)
|
||||
{
|
||||
return fireLaserClient(new Pos3D(from).centre().translate(direction, 0.501), direction, energy, world);
|
||||
}
|
||||
|
||||
public static MovingObjectPosition fireLaserClient(Pos3D from, EnumFacing direction, double energy, World world)
|
||||
public static RayTraceResult fireLaserClient(Pos3D from, EnumFacing direction, double energy, World world)
|
||||
{
|
||||
Pos3D to = from.clone().translate(direction, general.laserRange - 0.002);
|
||||
MovingObjectPosition mop = world.rayTraceBlocks(from, to);
|
||||
RayTraceResult mop = world.rayTraceBlocks(from, to);
|
||||
|
||||
if(mop != null)
|
||||
{
|
||||
@@ -128,11 +129,11 @@ public class LaserManager
|
||||
|
||||
public static class LaserInfo
|
||||
{
|
||||
public MovingObjectPosition movingPos;
|
||||
public RayTraceResult movingPos;
|
||||
|
||||
public boolean foundEntity;
|
||||
|
||||
public LaserInfo(MovingObjectPosition mop, boolean b)
|
||||
public LaserInfo(RayTraceResult mop, boolean b)
|
||||
{
|
||||
movingPos = mop;
|
||||
foundEntity = b;
|
||||
|
||||
@@ -114,6 +114,9 @@ import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.ChunkPos;
|
||||
import net.minecraft.world.biome.Biome;
|
||||
import net.minecraft.world.biome.BiomeProvider;
|
||||
import net.minecraftforge.common.ForgeChunkManager;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
@@ -244,9 +247,9 @@ public class Mekanism
|
||||
{
|
||||
//Storage Recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 3),
|
||||
"***", "***", "***", Character.valueOf('*'), new ItemStack(Items.coal, 1, 1)
|
||||
"***", "***", "***", Character.valueOf('*'), new ItemStack(Items.COAL, 1, 1)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.coal, 9, 1),
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.COAL, 9, 1),
|
||||
"*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 3)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2),
|
||||
@@ -297,10 +300,10 @@ public class Mekanism
|
||||
|
||||
//Base Recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1),
|
||||
"***", "XXX", "***", Character.valueOf('*'), Blocks.obsidian, Character.valueOf('X'), Blocks.tnt
|
||||
"***", "XXX", "***", Character.valueOf('*'), Blocks.OBSIDIAN, Character.valueOf('X'), Blocks.TNT
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.ElectricBow.getUnchargedItem(),
|
||||
" AB", "E B", " AB", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('B'), Items.string, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
" AB", "E B", " AB", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('B'), Items.STRING, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.EnergyTablet.getUnchargedItem(),
|
||||
"RCR", "ECE", "RCR", Character.valueOf('C'), "ingotGold", Character.valueOf('R'), "dustRedstone", Character.valueOf('E'), MekanismItems.EnrichedAlloy
|
||||
@@ -309,13 +312,13 @@ public class Mekanism
|
||||
"RCR", "iIi", "RCR", Character.valueOf('i'), "ingotIron", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), "alloyBasic", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.OSMIUM_COMPRESSOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 1),
|
||||
"ECE", "BIB", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('B'), Items.bucket, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"ECE", "BIB", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('B'), Items.BUCKET, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.COMBINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 2),
|
||||
"RCR", "SIS", "RCR", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"RCR", "SIS", "RCR", Character.valueOf('S'), Blocks.COBBLESTONE, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('R'), "alloyElite", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.CRUSHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 3),
|
||||
"RCR", "LIL", "RCR", Character.valueOf('R'), "dustRedstone", Character.valueOf('L'), Items.lava_bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"RCR", "LIL", "RCR", Character.valueOf('R'), "dustRedstone", Character.valueOf('L'), Items.LAVA_BUCKET, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade),
|
||||
" G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustOsmium"
|
||||
@@ -336,10 +339,10 @@ public class Mekanism
|
||||
"AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian"
|
||||
));
|
||||
BlockStateMachine.MachineType.METALLURGIC_INFUSER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8),
|
||||
"IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium"
|
||||
"IFI", "ROR", "IFI", Character.valueOf('I'), "ingotIron", Character.valueOf('F'), Blocks.FURNACE, Character.valueOf('R'), "dustRedstone", Character.valueOf('O'), "ingotOsmium"
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.TeleportationCore),
|
||||
"LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('G'), "ingotGold", Character.valueOf('D'), Items.diamond
|
||||
"LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.DYE, 1, 4), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('G'), "ingotGold", Character.valueOf('D'), Items.DIAMOND
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.PortableTeleporter.getUnchargedItem(),
|
||||
" E ", "CTC", " E ", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), MekanismItems.TeleportationCore
|
||||
@@ -351,7 +354,7 @@ public class Mekanism
|
||||
"ECE", "ORO", "ECE", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingotOsmium", Character.valueOf('R'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Configurator.getUnchargedItem(),
|
||||
" L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Items.stick
|
||||
" L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Items.DYE, 1, 4), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Items.STICK
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7),
|
||||
"OOO", "OGO", "OOO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('G'), "ingotRefinedGlowstone"
|
||||
@@ -363,13 +366,13 @@ public class Mekanism
|
||||
"RCR", "GIG", "RCR", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('R'), "alloyBasic", Character.valueOf('G'), "blockGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.ELECTRIC_PUMP.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12),
|
||||
" B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium"
|
||||
" B ", "ECE", "OOO", Character.valueOf('B'), Items.BUCKET, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium"
|
||||
));
|
||||
BlockStateMachine.MachineType.PERSONAL_CHEST.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13),
|
||||
"SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
"SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.CHEST, Character.valueOf('c'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 9),
|
||||
" I ", "IBI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('B'), Items.bucket
|
||||
" I ", "IBI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('B'), Items.BUCKET
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 4, 10),
|
||||
" I ", "IGI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), "blockGlass"
|
||||
@@ -378,7 +381,7 @@ public class Mekanism
|
||||
" I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
BlockStateMachine.MachineType.CHARGEPAD.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 14),
|
||||
"PPP", "SES", Character.valueOf('P'), Blocks.stone_pressure_plate, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
"PPP", "SES", Character.valueOf('P'), Blocks.STONE_PRESSURE_PLATE, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Robit.getUnchargedItem(),
|
||||
" S ", "ECE", "OIO", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13)
|
||||
@@ -390,7 +393,7 @@ public class Mekanism
|
||||
" O", "SCS", " S ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
BlockStateMachine.MachineType.LOGISTICAL_SORTER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15),
|
||||
"IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
"IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.PISTON, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
BlockStateMachine.MachineType.DIGITAL_MINER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4),
|
||||
"ACA", "SES", "TIT", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('S'), new ItemStack(MekanismBlocks.MachineBlock, 1, 15), Character.valueOf('E'), MekanismItems.Robit.getUnchargedItem(),
|
||||
@@ -404,7 +407,7 @@ public class Mekanism
|
||||
"SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.Dictionary),
|
||||
"C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.book
|
||||
"C", "B", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), Items.BOOK
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GasMask),
|
||||
" S ", "GCG", "S S", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
@@ -430,14 +433,14 @@ public class Mekanism
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.CardboardBox),
|
||||
"SS", "SS", Character.valueOf('S'), "pulpWood"
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.paper, 6),
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Items.PAPER, 6),
|
||||
"SSS", Character.valueOf('S'), MekanismItems.Sawdust
|
||||
));
|
||||
BlockStateMachine.MachineType.PRECISION_SAWMILL.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 5),
|
||||
"ICI", "ASA", "ICI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 14),
|
||||
"CGC", "IBI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), Character.valueOf('B'), Items.bucket
|
||||
"CGC", "IBI", "III", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), Character.valueOf('B'), Items.BUCKET
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 15),
|
||||
" I ", "ICI", " I ", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED)
|
||||
@@ -449,7 +452,7 @@ public class Mekanism
|
||||
"CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy
|
||||
));
|
||||
BlockStateMachine.MachineType.CHEMICAL_WASHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7),
|
||||
"CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"CWC", "EIE", "CGC", Character.valueOf('W'), Items.BUCKET, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.CHEMICAL_CRYSTALLIZER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8),
|
||||
"CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
@@ -464,10 +467,10 @@ public class Mekanism
|
||||
" A ", "ACA", " A ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(),
|
||||
"SLS", "STS", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
"SLS", "STS", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('L'), new ItemStack(Items.DYE, 1, 4), Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem()
|
||||
));
|
||||
BlockStateMachine.MachineType.SEISMIC_VIBRATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 9),
|
||||
"TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.DYE, 1, 4), Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
));
|
||||
BlockStateMachine.MachineType.PRESSURIZED_REACTION_CHAMBER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10),
|
||||
"TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC),
|
||||
@@ -476,11 +479,11 @@ public class Mekanism
|
||||
BlockStateMachine.MachineType.FLUIDIC_PLENISHER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12),
|
||||
"TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.rail, 24),
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(Blocks.RAIL, 24),
|
||||
"O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood"
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(),
|
||||
"TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED)
|
||||
"TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(GasTankTier.BASIC), Character.valueOf('S'), Items.FLINT_AND_STEEL, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismItems.GaugeDropper.getEmptyItem(),
|
||||
" O ", "G G", "GGG", Character.valueOf('O'), "ingotOsmium", Character.valueOf('G'), "paneGlass"
|
||||
@@ -504,7 +507,7 @@ public class Mekanism
|
||||
"RCR", "gWg", "RCR", Character.valueOf('R'), "alloyElite", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('g'), "ingotGold", Character.valueOf('W'), "plankWood"
|
||||
));
|
||||
BlockStateMachine.MachineType.OREDICTIONIFICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 3),
|
||||
"SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.chest
|
||||
"SGS", "CBC", "SWS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "paneGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('B'), MekanismItems.Dictionary, Character.valueOf('W'), Blocks.CHEST
|
||||
));
|
||||
BlockStateMachine.MachineType.LASER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 13),
|
||||
"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"
|
||||
@@ -515,10 +518,10 @@ public class Mekanism
|
||||
BlockStateMachine.MachineType.LASER_TRACTOR_BEAM.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 15),
|
||||
"C", "F", Character.valueOf('C'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('F'), new ItemStack(MekanismBlocks.MachineBlock2, 1, 14)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 6),
|
||||
"SFS", "FAF", "SFS", Character.valueOf('S'), "ingotSteel", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('F'), Blocks.iron_bars
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 6),
|
||||
"SFS", "FAF", "SFS", Character.valueOf('S'), "ingotSteel", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('F'), Blocks.IRON_BARS
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 7),
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 4, 7),
|
||||
" S ", "SIS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('I'), "ingotIron"
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 2, 8),
|
||||
@@ -534,17 +537,17 @@ public class Mekanism
|
||||
"OCO", "ATA", "OCO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), MekanismItems.TeleportationCore
|
||||
}));
|
||||
MachineType.FORMULAIC_ASSEMBLICATOR.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 5), new Object[] {
|
||||
"STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.crafting_table, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), Blocks.chest
|
||||
"STS", "BIB", "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('T'), Blocks.CRAFTING_TABLE, Character.valueOf('B'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), Blocks.CHEST
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.CraftingFormula), new Object[] {
|
||||
Items.paper, MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
Items.PAPER, MekanismUtils.getControlCircuit(BaseTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 9), new Object[] {
|
||||
"SGS", "CIC", "STS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8),
|
||||
Character.valueOf('T'), MekanismItems.TeleportationCore
|
||||
}));
|
||||
MachineType.FUELWOOD_HEATER.addRecipe(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock3, 1, 6), new Object[] {
|
||||
"SCS", "FHF", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('F'), Blocks.furnace, Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
"SCS", "FHF", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('F'), Blocks.FURNACE, Character.valueOf('H'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8)
|
||||
}));
|
||||
|
||||
//Energy Cube recipes
|
||||
@@ -591,16 +594,16 @@ public class Mekanism
|
||||
|
||||
//Bin recipes
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.BASIC), new Object[] {
|
||||
"SCS", "A A", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), "alloyBasic"
|
||||
"SCS", "A A", "SSS", Character.valueOf('S'), Blocks.COBBLESTONE, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.BASIC), Character.valueOf('A'), "alloyBasic"
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ADVANCED), new Object[] {
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('A'), "alloyAdvanced", Character.valueOf('B'), MekanismUtils.getBin(BinTier.BASIC)
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.COBBLESTONE, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ADVANCED), Character.valueOf('A'), "alloyAdvanced", Character.valueOf('B'), MekanismUtils.getBin(BinTier.BASIC)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ELITE), new Object[] {
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('A'), "alloyElite", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ADVANCED)
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.COBBLESTONE, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ELITE), Character.valueOf('A'), "alloyElite", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ADVANCED)
|
||||
}));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(MekanismUtils.getBin(BinTier.ULTIMATE), new Object[] {
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ELITE)
|
||||
"SCS", "ABA", "SSS", Character.valueOf('S'), Blocks.COBBLESTONE, Character.valueOf('C'), MekanismUtils.getControlCircuit(BaseTier.ULTIMATE), Character.valueOf('A'), "alloyUltimate", Character.valueOf('B'), MekanismUtils.getBin(BinTier.ELITE)
|
||||
}));
|
||||
|
||||
//Induction Cell recipes
|
||||
@@ -673,7 +676,7 @@ public class Mekanism
|
||||
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 2)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 4),
|
||||
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.bucket
|
||||
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.BUCKET
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 5),
|
||||
"TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 4)
|
||||
@@ -709,10 +712,10 @@ public class Mekanism
|
||||
"TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 14)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 16),
|
||||
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars
|
||||
"SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.IRON_BARS
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 17),
|
||||
"RRR", "SBS", "RRR", Character.valueOf('R'), "dustRedstone", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars
|
||||
"RRR", "SBS", "RRR", Character.valueOf('R'), "dustRedstone", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.IRON_BARS
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 18),
|
||||
"SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "ingotCopper"
|
||||
@@ -741,7 +744,7 @@ public class Mekanism
|
||||
"SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15),
|
||||
"PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust
|
||||
"PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), Items.GLOWSTONE_DUST
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.PlasticFence, 3, 15),
|
||||
"BSB", "BSB", Character.valueOf('B'), new ItemStack(MekanismBlocks.PlasticBlock, 1, 15), Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 3)
|
||||
@@ -753,14 +756,14 @@ public class Mekanism
|
||||
"SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i),
|
||||
"PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust
|
||||
"PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.GLOWSTONE_DUST
|
||||
));
|
||||
}
|
||||
|
||||
for(int i = 0; i < EnumColor.DYES.length; i++)
|
||||
{
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismItems.Balloon, 2, i),
|
||||
Items.leather, Items.string, "dye" + EnumColor.DYES[i].dyeName
|
||||
Items.LEATHER, Items.STRING, "dye" + EnumColor.DYES[i].dyeName
|
||||
));
|
||||
|
||||
for(int j = 0; j < EnumColor.DYES.length; j++)
|
||||
@@ -787,13 +790,13 @@ public class Mekanism
|
||||
}
|
||||
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessMekanismRecipe(new ItemStack(MekanismBlocks.GlowPlasticBlock, 3, i),
|
||||
new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.glowstone_dust)
|
||||
new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), new ItemStack(Items.GLOWSTONE_DUST)
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.ReinforcedPlasticBlock, 4, i),
|
||||
" P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.PlasticBlock, 1, i), Character.valueOf('O'), "dustOsmium"
|
||||
));
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapedMekanismRecipe(new ItemStack(MekanismBlocks.RoadPlasticBlock, 3, i),
|
||||
"SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i)
|
||||
"SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.SAND, Character.valueOf('P'), new ItemStack(MekanismBlocks.SlickPlasticBlock, 1, i)
|
||||
));
|
||||
}
|
||||
|
||||
@@ -802,33 +805,33 @@ public class Mekanism
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.OSMIUM.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.iron_ingot), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.gold_ingot), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.IRON.ordinal()), new ItemStack(Items.IRON_INGOT), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.GOLD.ordinal()), new ItemStack(Items.GOLD_INGOT), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.OtherDust, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.COPPER.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F);
|
||||
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(MekanismItems.Dust, 1, Resource.TIN.ordinal()), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F);
|
||||
|
||||
//Enrichment Chamber Recipes
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.OtherDust, 2, 6));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(MekanismItems.CompressedCarbon));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(MekanismItems.CompressedCarbon));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(MekanismItems.CompressedRedstone));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(Items.dye, 12, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.diamond_ore), new ItemStack(Items.diamond, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.mossy_cobblestone), new ItemStack(Blocks.cobblestone));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.stonebrick, 1, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.gravel));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.cobblestone));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stonebrick, 1, 0));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 3));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new ItemStack(Blocks.stonebrick, 1, 0));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.clay), new ItemStack(Items.clay_ball, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.REDSTONE_ORE), new ItemStack(Items.REDSTONE, 12));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.OBSIDIAN), new ItemStack(MekanismItems.OtherDust, 2, 6));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.COAL, 1, 0), new ItemStack(MekanismItems.CompressedCarbon));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.COAL, 1, 1), new ItemStack(MekanismItems.CompressedCarbon));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.REDSTONE), new ItemStack(MekanismItems.CompressedRedstone));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.LAPIS_ORE), new ItemStack(Items.DYE, 12, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.COAL_ORE), new ItemStack(Items.COAL, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.DIAMOND_ORE), new ItemStack(Items.DIAMOND, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.MOSSY_COBBLESTONE), new ItemStack(Blocks.COBBLESTONE));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.STONE), new ItemStack(Blocks.STONEBRICK, 1, 2));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.SAND), new ItemStack(Blocks.GRAVEL));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Blocks.COBBLESTONE));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.GUNPOWDER), new ItemStack(Items.FLINT));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.STONEBRICK, 1, 2), new ItemStack(Blocks.STONEBRICK, 1, 0));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.STONEBRICK, 1, 0), new ItemStack(Blocks.STONEBRICK, 1, 3));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.STONEBRICK, 1, 1), new ItemStack(Blocks.STONEBRICK, 1, 0));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.GLOWSTONE), new ItemStack(Items.GLOWSTONE_DUST, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.CLAY), new ItemStack(Items.CLAY_BALL, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.SaltBlock), new ItemStack(MekanismItems.Salt, 4));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.CompressedDiamond));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.DIAMOND), new ItemStack(MekanismItems.CompressedDiamond));
|
||||
RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismItems.Polyethene, 3, 0), new ItemStack(MekanismItems.Polyethene, 1, 2));
|
||||
|
||||
for(int i = 0; i < EnumColor.DYES.length; i++)
|
||||
@@ -837,12 +840,12 @@ public class Mekanism
|
||||
}
|
||||
|
||||
//Combiner recipes
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.redstone, 16), new ItemStack(Blocks.redstone_ore));
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.dye, 16, 4), new ItemStack(Blocks.lapis_ore));
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.flint), new ItemStack(Blocks.gravel));
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.REDSTONE, 16), new ItemStack(Blocks.REDSTONE_ORE));
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.DYE, 16, 4), new ItemStack(Blocks.LAPIS_ORE));
|
||||
RecipeHandler.addCombinerRecipe(new ItemStack(Items.FLINT), new ItemStack(Blocks.GRAVEL));
|
||||
|
||||
//Osmium Compressor Recipes
|
||||
RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(MekanismItems.Ingot, 1, 3));
|
||||
RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.GLOWSTONE_DUST), new ItemStack(MekanismItems.Ingot, 1, 3));
|
||||
|
||||
//Crusher Recipes
|
||||
RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.OtherDust, 1, 0));
|
||||
@@ -878,45 +881,45 @@ public class Mekanism
|
||||
RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.pumpkin), new ItemStack(MekanismItems.BioFuel, 6));
|
||||
|
||||
//Purification Chamber Recipes
|
||||
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint));
|
||||
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.GRAVEL), new ItemStack(Items.FLINT));
|
||||
|
||||
//Chemical Injection Chamber Recipes
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.dirt), "water", new ItemStack(Blocks.clay));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.hardened_clay), "water", new ItemStack(Blocks.clay));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.brick), "water", new ItemStack(Items.clay_ball));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.gunpowder), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.DIRT), "water", new ItemStack(Blocks.CLAY));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Blocks.HARDENED_CLAY), "water", new ItemStack(Blocks.CLAY));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.BRICK), "water", new ItemStack(Items.CLAY_BALL));
|
||||
RecipeHandler.addChemicalInjectionChamberRecipe(new ItemStack(Items.GUNPOWDER), "hydrogenChloride", new ItemStack(MekanismItems.OtherDust, 1, 3));
|
||||
|
||||
//Precision Sawmill Recipes
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.ladder, 3), new ItemStack(Items.stick, 7));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.torch, 4), new ItemStack(Items.stick), new ItemStack(Items.coal), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.chest), new ItemStack(Blocks.planks, 8));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.trapdoor), new ItemStack(Blocks.planks, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.boat), new ItemStack(Blocks.planks, 5));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.bed), new ItemStack(Blocks.planks, 3), new ItemStack(Blocks.wool, 3), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.oak_door), new ItemStack(Blocks.planks, 6, 0));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.spruce_door), new ItemStack(Blocks.planks, 6, 1));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.birch_door), new ItemStack(Blocks.planks, 6, 2));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.jungle_door), new ItemStack(Blocks.planks, 6, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.acacia_door), new ItemStack(Blocks.planks, 6, 4));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.dark_oak_door), new ItemStack(Blocks.planks, 6, 5));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jukebox), new ItemStack(Blocks.planks, 8), new ItemStack(Items.diamond), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.bookshelf), new ItemStack(Blocks.planks, 6), new ItemStack(Items.book, 3), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.wooden_pressure_plate), new ItemStack(Blocks.planks, 2));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence), new ItemStack(Items.stick, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence_gate), new ItemStack(Blocks.planks, 2, 0), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence_gate), new ItemStack(Blocks.planks, 2, 1), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence_gate), new ItemStack(Blocks.planks, 2, 2), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence_gate), new ItemStack(Blocks.planks, 2, 3), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence_gate), new ItemStack(Blocks.planks, 2, 4), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence_gate), new ItemStack(Blocks.planks, 2, 5), new ItemStack(Items.stick, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.noteblock), new ItemStack(Blocks.planks, 8), new ItemStack(Items.redstone), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.redstone_torch), new ItemStack(Items.stick), new ItemStack(Items.redstone), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ItemStack(Blocks.planks, 4));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.LADDER, 3), new ItemStack(Items.STICK, 7));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.TORCH, 4), new ItemStack(Items.STICK), new ItemStack(Items.coal), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.CHEST), new ItemStack(Blocks.PLANKS, 8));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.TRAPDOOR), new ItemStack(Blocks.PLANKS, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BOAT), new ItemStack(Blocks.PLANKS, 5));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BED), new ItemStack(Blocks.PLANKS, 3), new ItemStack(Blocks.wool, 3), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.OAK_DOOR), new ItemStack(Blocks.PLANKS, 6, 0));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.SPRUCE_DOOR), new ItemStack(Blocks.PLANKS, 6, 1));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.BIRCH_DOOR), new ItemStack(Blocks.PLANKS, 6, 2));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.JUNGLE_DOOR), new ItemStack(Blocks.PLANKS, 6, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.acacia_door), new ItemStack(Blocks.PLANKS, 6, 4));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Items.dark_oak_door), new ItemStack(Blocks.PLANKS, 6, 5));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jukebox), new ItemStack(Blocks.PLANKS, 8), new ItemStack(Items.diamond), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.bookshelf), new ItemStack(Blocks.PLANKS, 6), new ItemStack(Items.book, 3), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.wooden_pressure_plate), new ItemStack(Blocks.PLANKS, 2));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence), new ItemStack(Items.STICK, 3));
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.oak_fence_gate), new ItemStack(Blocks.PLANKS, 2, 0), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.spruce_fence_gate), new ItemStack(Blocks.PLANKS, 2, 1), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.birch_fence_gate), new ItemStack(Blocks.PLANKS, 2, 2), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.jungle_fence_gate), new ItemStack(Blocks.PLANKS, 2, 3), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.acacia_fence_gate), new ItemStack(Blocks.PLANKS, 2, 4), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.dark_oak_fence_gate), new ItemStack(Blocks.PLANKS, 2, 5), new ItemStack(Items.STICK, 4), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.noteblock), new ItemStack(Blocks.PLANKS, 8), new ItemStack(Items.redstone), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.redstone_torch), new ItemStack(Items.STICK), new ItemStack(Items.redstone), 1);
|
||||
RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ItemStack(Blocks.PLANKS, 4));
|
||||
|
||||
//Metallurgic Infuser Recipes
|
||||
RecipeHandler.addMetallurgicInfuserRecipe(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.EnrichedIron));
|
||||
@@ -1033,7 +1036,7 @@ public class Mekanism
|
||||
OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock);
|
||||
|
||||
//Alloys!
|
||||
OreDictionary.registerOre("alloyBasic", new ItemStack(Items.redstone));
|
||||
OreDictionary.registerOre("alloyBasic", new ItemStack(Items.REDSTONE));
|
||||
OreDictionary.registerOre("alloyAdvanced", new ItemStack(MekanismItems.EnrichedAlloy));
|
||||
OreDictionary.registerOre("alloyElite", new ItemStack(MekanismItems.ReinforcedAlloy));
|
||||
OreDictionary.registerOre("alloyUltimate", new ItemStack(MekanismItems.AtomicAlloy));
|
||||
@@ -1365,7 +1368,7 @@ public class Mekanism
|
||||
//Add baby skeleton spawner
|
||||
if(general.spawnBabySkeletons)
|
||||
{
|
||||
for(BiomeGenBase biome : WorldChunkManager.allowedBiomes)
|
||||
for(Biome biome : BiomeProvider.allowedBiomes)
|
||||
{
|
||||
if(biome.getSpawnableList(EnumCreatureType.MONSTER) != null && biome.getSpawnableList(EnumCreatureType.MONSTER).size() > 0)
|
||||
{
|
||||
@@ -1487,19 +1490,19 @@ public class Mekanism
|
||||
{
|
||||
MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.bedrock, 0);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.portal, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.end_portal, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.end_portal_frame, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.bed, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.oak_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.spruce_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.birch_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.jungle_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.acacia_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.dark_oak_door, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.iron_door, OreDictionary.WILDCARD_VALUE);
|
||||
// MekanismAPI.addBoxBlacklist(MultipartProxy.block(), OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.BEDROCK, 0);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.PORTAL, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.END_PORTAL_FRAME, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.BED, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.OAK_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.SPRUCE_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.BIRCH_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.JUNGLE_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.ACACIA_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.DARK_OAK_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
MekanismAPI.addBoxBlacklist(Blocks.IRON_DOOR, OreDictionary.WILDCARD_VALUE);
|
||||
//MekanismAPI.addBoxBlacklist(MultipartProxy.block(), OreDictionary.WILDCARD_VALUE); TODO
|
||||
|
||||
BoxBlacklistParser.load();
|
||||
}
|
||||
@@ -1507,7 +1510,7 @@ public class Mekanism
|
||||
@SubscribeEvent
|
||||
public synchronized void onChunkLoad(ChunkEvent.Load event)
|
||||
{
|
||||
if(event.getChunk() != null && !event.world.isRemote)
|
||||
if(event.getChunk() != null && !event.getWorld().isRemote)
|
||||
{
|
||||
Map copy = (Map)((HashMap)event.getChunk().getTileEntityMap()).clone();
|
||||
|
||||
@@ -1535,7 +1538,7 @@ public class Mekanism
|
||||
@SubscribeEvent
|
||||
public void chunkSave(ChunkDataEvent.Save event)
|
||||
{
|
||||
if(!event.world.isRemote)
|
||||
if(!event.getWorld().isRemote)
|
||||
{
|
||||
NBTTagCompound nbtTags = event.getData();
|
||||
|
||||
@@ -1547,7 +1550,7 @@ public class Mekanism
|
||||
@SubscribeEvent
|
||||
public synchronized void onChunkDataLoad(ChunkDataEvent.Load event)
|
||||
{
|
||||
if(!event.world.isRemote)
|
||||
if(!event.getWorld().isRemote)
|
||||
{
|
||||
if(general.enableWorldRegeneration)
|
||||
{
|
||||
@@ -1558,8 +1561,8 @@ public class Mekanism
|
||||
return;
|
||||
}
|
||||
|
||||
ChunkCoordIntPair coordPair = event.getChunk().getChunkCoordIntPair();
|
||||
worldTickHandler.addRegenChunk(event.world.provider.getDimensionId(), coordPair);
|
||||
ChunkPos coordPair = event.getChunk().getChunkCoordIntPair();
|
||||
worldTickHandler.addRegenChunk(event.getWorld().provider.getDimension(), coordPair);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1567,7 +1570,7 @@ public class Mekanism
|
||||
@SubscribeEvent
|
||||
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event)
|
||||
{
|
||||
if(event.modID.equals("Mekanism"))
|
||||
if(event.getModID().equals("Mekanism"))
|
||||
{
|
||||
proxy.loadConfiguration();
|
||||
proxy.onConfigSync(false);
|
||||
|
||||
@@ -76,6 +76,8 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.Vec3d;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.network.ByteBufUtils;
|
||||
import net.minecraftforge.fml.common.network.NetworkRegistry;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
|
||||
@@ -278,9 +280,9 @@ public class PacketHandler
|
||||
*/
|
||||
public void sendToAll(IMessage message)
|
||||
{
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
|
||||
for(EntityPlayerMP player : server.getConfigurationManager().playerEntityList)
|
||||
for(EntityPlayerMP player : server.getPlayerList().getPlayerList())
|
||||
{
|
||||
sendTo(message, player);
|
||||
}
|
||||
@@ -324,13 +326,13 @@ public class PacketHandler
|
||||
*/
|
||||
public void sendToCuboid(IMessage message, AxisAlignedBB cuboid, int dimId)
|
||||
{
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
|
||||
if(server != null && cuboid != null)
|
||||
{
|
||||
for(EntityPlayerMP player : (List<EntityPlayerMP>)server.getConfigurationManager().playerEntityList)
|
||||
for(EntityPlayerMP player : (List<EntityPlayerMP>)server.getPlayerList().getPlayerList())
|
||||
{
|
||||
if(player.dimension == dimId && cuboid.isVecInside(new Vec3(player.posX, player.posY, player.posZ)))
|
||||
if(player.dimension == dimId && cuboid.isVecInside(new Vec3d(player.posX, player.posY, player.posZ)))
|
||||
{
|
||||
sendTo(message, player);
|
||||
}
|
||||
@@ -340,11 +342,11 @@ public class PacketHandler
|
||||
|
||||
public void sendToReceivers(IMessage message, Range4D range)
|
||||
{
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
|
||||
if(server != null)
|
||||
{
|
||||
for(EntityPlayerMP player : (List<EntityPlayerMP>)server.getConfigurationManager().playerEntityList)
|
||||
for(EntityPlayerMP player : (List<EntityPlayerMP>)server.getPlayerList().getPlayerList())
|
||||
{
|
||||
if(player.dimension == range.dimensionId && Range4D.getChunkRange(player).intersects(range))
|
||||
{
|
||||
|
||||
@@ -397,7 +397,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
|
||||
if(!world.isRemote && type == BasicBlockType.BIN)
|
||||
{
|
||||
TileEntityBin bin = (TileEntityBin)world.getTileEntity(pos);
|
||||
MovingObjectPosition mop = MekanismUtils.rayTrace(world, player);
|
||||
RayTraceResult mop = MekanismUtils.rayTrace(world, player);
|
||||
|
||||
if(mop != null && mop.sideHit == bin.facing)
|
||||
{
|
||||
@@ -850,7 +850,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
BasicBlockType type = BasicBlockType.get(state);
|
||||
|
||||
@@ -66,7 +66,7 @@ public class BlockBounding extends Block
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
try {
|
||||
TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(pos);
|
||||
|
||||
@@ -148,7 +148,7 @@ public class BlockCardboardBox extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
TileEntityCardboardBox tileEntity = (TileEntityCardboardBox)world.getTileEntity(pos);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
|
||||
@@ -278,7 +278,7 @@ public class BlockEnergyCube extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(pos);
|
||||
ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube);
|
||||
|
||||
@@ -259,7 +259,7 @@ public class BlockGasTank extends BlockContainer
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(pos);
|
||||
ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank);
|
||||
|
||||
@@ -832,7 +832,7 @@ public abstract class BlockMachine extends BlockContainer implements ICTMBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
|
||||
@@ -109,7 +109,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
|
||||
{
|
||||
Vec3 localVec = new Vec3(posX, posY, posZ);
|
||||
Vec3 motionVec = new Vec3(posX + motionX*2, posY + motionY*2, posZ + motionZ*2);
|
||||
MovingObjectPosition mop = worldObj.rayTraceBlocks(localVec, motionVec, true, false, false);
|
||||
RayTraceResult mop = worldObj.rayTraceBlocks(localVec, motionVec, true, false, false);
|
||||
localVec = new Vec3(posX, posY, posZ);
|
||||
motionVec = new Vec3(posX + motionX, posY + motionY, posZ + motionZ);
|
||||
|
||||
@@ -129,11 +129,11 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
|
||||
{
|
||||
float boundsScale = 0.3F;
|
||||
AxisAlignedBB newBounds = entity1.getEntityBoundingBox().expand((double)boundsScale, (double)boundsScale, (double)boundsScale);
|
||||
MovingObjectPosition movingobjectposition1 = newBounds.calculateIntercept(localVec, motionVec);
|
||||
RayTraceResult RayTraceResult1 = newBounds.calculateIntercept(localVec, motionVec);
|
||||
|
||||
if(movingobjectposition1 != null)
|
||||
if(RayTraceResult1 != null)
|
||||
{
|
||||
double dist = localVec.distanceTo(movingobjectposition1.hitVec);
|
||||
double dist = localVec.distanceTo(RayTraceResult1.hitVec);
|
||||
|
||||
if(dist < entityDist || entityDist == 0)
|
||||
{
|
||||
@@ -146,7 +146,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData
|
||||
|
||||
if(entity != null)
|
||||
{
|
||||
mop = new MovingObjectPosition(entity);
|
||||
mop = new RayTraceResult(entity);
|
||||
}
|
||||
|
||||
if(mop != null && mop.entityHit instanceof EntityPlayer)
|
||||
|
||||
@@ -71,7 +71,7 @@ public class ContainerEnergyCube extends Container
|
||||
|
||||
if(ChargeUtils.canBeCharged(slotStack) || ChargeUtils.canBeDischarged(slotStack))
|
||||
{
|
||||
if(slotStack.getItem() == Items.redstone)
|
||||
if(slotStack.getItem() == Items.REDSTONE)
|
||||
{
|
||||
if(slotID != 1)
|
||||
{
|
||||
|
||||
@@ -70,7 +70,7 @@ public class ContainerInductionMatrix extends Container
|
||||
|
||||
if(ChargeUtils.canBeCharged(slotStack) || ChargeUtils.canBeDischarged(slotStack))
|
||||
{
|
||||
if(slotStack.getItem() == Items.redstone)
|
||||
if(slotStack.getItem() == Items.REDSTONE)
|
||||
{
|
||||
if(slotID != 1)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,7 @@ import mekanism.common.inventory.slot.SlotPersonalChest;
|
||||
import mekanism.common.tile.TileEntityPersonalChest;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.ClickType;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
@@ -137,9 +138,9 @@ public class ContainerPersonalChest extends Container
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack slotClick(int slotNumber, int destSlot, int modifier, EntityPlayer player)
|
||||
public ItemStack slotClick(int slotNumber, int destSlot, ClickType clickType, EntityPlayer player)
|
||||
{
|
||||
if(modifier == 2 && destSlot >= 0 && destSlot < 9)
|
||||
if(destSlot >= 0 && destSlot < 9)
|
||||
{
|
||||
ItemStack itemStack = player.inventory.getStackInSlot(destSlot);
|
||||
|
||||
@@ -149,6 +150,6 @@ public class ContainerPersonalChest extends Container
|
||||
}
|
||||
}
|
||||
|
||||
return super.slotClick(slotNumber, destSlot, modifier, player);
|
||||
return super.slotClick(slotNumber, destSlot, clickType, player);
|
||||
}
|
||||
}
|
||||
@@ -500,14 +500,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
||||
{
|
||||
if(SecurityUtils.canAccess(entityplayer, itemstack))
|
||||
{
|
||||
MovingObjectPosition pos = getMovingObjectPositionFromPlayer(world, entityplayer, !entityplayer.isSneaking());
|
||||
RayTraceResult pos = getRayTraceResultFromPlayer(world, entityplayer, !entityplayer.isSneaking());
|
||||
|
||||
if(pos == null)
|
||||
{
|
||||
return itemstack;
|
||||
}
|
||||
else {
|
||||
if(pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
|
||||
if(pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK)
|
||||
{
|
||||
Coord4D coord = new Coord4D(pos.getBlockPos(), world);
|
||||
|
||||
|
||||
@@ -463,13 +463,13 @@ public abstract class PartSidedPipe extends Multipart implements IOccludingPart,
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addHitEffects(MovingObjectPosition hit, EffectRenderer effectRenderer)
|
||||
public void addHitEffects(RayTraceResult hit, EffectRenderer effectRenderer)
|
||||
{
|
||||
IconHitEffects.addHitEffects(this, hit, effectRenderer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addDestroyEffects(MovingObjectPosition mop, EffectRenderer effectRenderer)
|
||||
public void addDestroyEffects(RayTraceResult mop, EffectRenderer effectRenderer)
|
||||
{
|
||||
IconHitEffects.addDestroyEffects(this, effectRenderer, false);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ITickable;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.Constants.NBT;
|
||||
|
||||
@@ -284,8 +286,8 @@ public abstract class TileEntityContainerBlock extends TileEntityBasicBlock impl
|
||||
public void clear() {}
|
||||
|
||||
@Override
|
||||
public IChatComponent getDisplayName()
|
||||
public ITextComponent getDisplayName()
|
||||
{
|
||||
return new ChatComponentText(getName());
|
||||
return new TextComponentString(getName());
|
||||
}
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
|
||||
public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IActiveState
|
||||
@@ -47,7 +48,7 @@ public class TileEntityLaser extends TileEntityNoisyElectricBlock implements IAc
|
||||
{
|
||||
if(isActive)
|
||||
{
|
||||
MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, usage.laserUsage, worldObj);
|
||||
RayTraceResult mop = LaserManager.fireLaserClient(this, facing, usage.laserUsage, worldObj);
|
||||
Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj);
|
||||
|
||||
if(hitCoord == null || !hitCoord.equals(digging))
|
||||
|
||||
@@ -75,7 +75,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
|
||||
{
|
||||
if(on)
|
||||
{
|
||||
MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj);
|
||||
RayTraceResult mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj);
|
||||
Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj);
|
||||
|
||||
if(hitCoord == null || !hitCoord.equals(digging))
|
||||
|
||||
@@ -63,7 +63,7 @@ public class TileEntityLaserTractorBeam extends TileEntityContainerBlock impleme
|
||||
{
|
||||
if(on)
|
||||
{
|
||||
MovingObjectPosition mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj);
|
||||
RayTraceResult mop = LaserManager.fireLaserClient(this, facing, lastFired, worldObj);
|
||||
Coord4D hitCoord = mop == null ? null : new Coord4D(mop, worldObj);
|
||||
|
||||
if(hitCoord == null || !hitCoord.equals(digging))
|
||||
|
||||
@@ -749,7 +749,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo
|
||||
releaseChunks();
|
||||
chunkTicket = ticket;
|
||||
|
||||
ForgeChunkManager.forceChunk(chunkTicket, new Chunk3D(Coord4D.get(this)).toPair());
|
||||
ForgeChunkManager.forceChunk(chunkTicket, new Chunk3D(Coord4D.get(this)).getPos());
|
||||
}
|
||||
|
||||
public void releaseChunks()
|
||||
|
||||
@@ -1087,7 +1087,7 @@ public final class MekanismUtils
|
||||
* @param player - player to raytrace
|
||||
* @return raytraced value
|
||||
*/
|
||||
public static MovingObjectPosition rayTrace(World world, EntityPlayer player)
|
||||
public static RayTraceResult rayTrace(World world, EntityPlayer player)
|
||||
{
|
||||
double reach = Mekanism.proxy.getReach(player);
|
||||
|
||||
|
||||
@@ -615,7 +615,7 @@ public abstract class BlockGenerator extends BlockContainer implements ICTMBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player)
|
||||
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
|
||||
{
|
||||
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(pos);
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
|
||||
@@ -11,6 +11,7 @@ import mekanism.common.util.MekanismUtils;
|
||||
import micdoodle8.mods.galacticraft.api.world.ISolarLevel;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.world.biome.BiomeDesert;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -84,7 +85,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
|
||||
|
||||
public boolean isDesert()
|
||||
{
|
||||
return worldObj.provider.getBiomeGenForCoords(getPos()).getBiomeClass() == BiomeGenDesert.class;
|
||||
return worldObj.provider.getBiomeForCoords(getPos()).getBiomeClass() == BiomeDesert.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,18 +16,18 @@ public class ItemMekanismPaxel extends ItemMekanismTool
|
||||
@Override
|
||||
public float getDigSpeed(ItemStack stack, IBlockState blockState)
|
||||
{
|
||||
return blockState.getBlock() != Blocks.bedrock ? efficiencyOnProperMaterial : 1.0F;
|
||||
return blockState.getBlock() != Blocks.BEDROCK ? efficiencyOnProperMaterial : 1.0F;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canHarvestBlock(Block block, ItemStack stack)
|
||||
{
|
||||
if(block == Blocks.obsidian)
|
||||
if(block == Blocks.OBSIDIAN)
|
||||
{
|
||||
return toolMaterial.getHarvestLevel() == 3;
|
||||
}
|
||||
|
||||
if(block == Blocks.diamond_block || block == Blocks.diamond_ore)
|
||||
if(block == Blocks.DIAMOND_BLOCK || block == Blocks.DIAMOND_ORE)
|
||||
{
|
||||
return toolMaterial.getHarvestLevel() >= 2;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user