Skip to content

Commit

Permalink
Update to Forge 1.8.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@gravityfox
gravityfox committed Jan 15, 2016
1 parent 704b26b commit 5a53c42
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 69 deletions.
6 changes: 3 additions & 3 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
}
}
Expand All @@ -27,15 +27,15 @@ targetCompatibility = '1.8'


minecraft {
version = "1.8-11.14.4.1577"
version = "1.8.9-11.15.0.1694"
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "stable_18"
mappings = "snapshot_20160109"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down
130 changes: 65 additions & 65 deletions src/main/java/net/foxdenstudio/sponge/foxcore/mod/render/Highlight.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

public class Highlight implements IRenderable {

private static final float OFFSET = 0.005f;
private static final double OFFSET = 0.005;
private static final int PERIOD = 2000;
public transient double distance;
boolean[][][] filled = new boolean[3][3][3];
Expand Down Expand Up @@ -68,99 +68,99 @@ public void render() {

public void drawBoxFaces() {

final float x1 = pos.getX() - OFFSET;
final float y1 = pos.getY() - OFFSET;
final float z1 = pos.getZ() - OFFSET;
final float x2 = pos.getX() + OFFSET + 1;
final float y2 = pos.getY() + OFFSET + 1;
final float z2 = pos.getZ() + OFFSET + 1;
final double x1 = pos.getX() - OFFSET;
final double y1 = pos.getY() - OFFSET;
final double z1 = pos.getZ() - OFFSET;
final double x2 = pos.getX() + OFFSET + 1;
final double y2 = pos.getY() + OFFSET + 1;
final double z2 = pos.getZ() + OFFSET + 1;

glBegin(GL_QUADS);
if (!filled[0][1][1]) {
glVertex3f(x1, y1, z1);
glVertex3f(x1, y1, z2);
glVertex3f(x1, y2, z2);
glVertex3f(x1, y2, z1);
glVertex3d(x1, y1, z1);
glVertex3d(x1, y1, z2);
glVertex3d(x1, y2, z2);
glVertex3d(x1, y2, z1);
}

if (!filled[1][0][1]) {
glVertex3f(x1, y1, z1);
glVertex3f(x2, y1, z1);
glVertex3f(x2, y1, z2);
glVertex3f(x1, y1, z2);
glVertex3d(x1, y1, z1);
glVertex3d(x2, y1, z1);
glVertex3d(x2, y1, z2);
glVertex3d(x1, y1, z2);
}

if (!filled[1][1][0]) {
glVertex3f(x1, y1, z1);
glVertex3f(x1, y2, z1);
glVertex3f(x2, y2, z1);
glVertex3f(x2, y1, z1);
glVertex3d(x1, y1, z1);
glVertex3d(x1, y2, z1);
glVertex3d(x2, y2, z1);
glVertex3d(x2, y1, z1);
}

if (!filled[2][1][1]) {
glVertex3f(x2, y1, z1);
glVertex3f(x2, y2, z1);
glVertex3f(x2, y2, z2);
glVertex3f(x2, y1, z2);
glVertex3d(x2, y1, z1);
glVertex3d(x2, y2, z1);
glVertex3d(x2, y2, z2);
glVertex3d(x2, y1, z2);
}

if (!filled[1][2][1]) {
glVertex3f(x1, y2, z1);
glVertex3f(x1, y2, z2);
glVertex3f(x2, y2, z2);
glVertex3f(x2, y2, z1);
glVertex3d(x1, y2, z1);
glVertex3d(x1, y2, z2);
glVertex3d(x2, y2, z2);
glVertex3d(x2, y2, z1);
}

if (!filled[1][1][2]) {
glVertex3f(x1, y1, z2);
glVertex3f(x2, y1, z2);
glVertex3f(x2, y2, z2);
glVertex3f(x1, y2, z2);
glVertex3d(x1, y1, z2);
glVertex3d(x2, y1, z2);
glVertex3d(x2, y2, z2);
glVertex3d(x1, y2, z2);
}

glEnd();
}

public void drawBoxLines() {
final float x1 = pos.getX() - OFFSET;
final float y1 = pos.getY() - OFFSET;
final float z1 = pos.getZ() - OFFSET;
final float x2 = pos.getX() + OFFSET + 1;
final float y2 = pos.getY() + OFFSET + 1;
final float z2 = pos.getZ() + OFFSET + 1;
final double x1 = pos.getX() - OFFSET;
final double y1 = pos.getY() - OFFSET;
final double z1 = pos.getZ() - OFFSET;
final double x2 = pos.getX() + OFFSET + 1;
final double y2 = pos.getY() + OFFSET + 1;
final double z2 = pos.getZ() + OFFSET + 1;

glEnable(GL_LINE_SMOOTH);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glBegin(GL_LINES);

glVertex3f(x1, y1, z1);
glVertex3f(x2, y1, z1);
glVertex3f(x1, y1, z1);
glVertex3f(x1, y2, z1);
glVertex3f(x1, y1, z1);
glVertex3f(x1, y1, z2);

glVertex3f(x2, y1, z1);
glVertex3f(x2, y2, z1);
glVertex3f(x2, y1, z1);
glVertex3f(x2, y1, z2);

glVertex3f(x1, y2, z1);
glVertex3f(x2, y2, z1);
glVertex3f(x1, y2, z1);
glVertex3f(x1, y2, z2);

glVertex3f(x1, y1, z2);
glVertex3f(x2, y1, z2);
glVertex3f(x1, y1, z2);
glVertex3f(x1, y2, z2);

glVertex3f(x2, y2, z1);
glVertex3f(x2, y2, z2);
glVertex3f(x2, y1, z2);
glVertex3f(x2, y2, z2);
glVertex3f(x1, y2, z2);
glVertex3f(x2, y2, z2);
glVertex3d(x1, y1, z1);
glVertex3d(x2, y1, z1);
glVertex3d(x1, y1, z1);
glVertex3d(x1, y2, z1);
glVertex3d(x1, y1, z1);
glVertex3d(x1, y1, z2);

glVertex3d(x2, y1, z1);
glVertex3d(x2, y2, z1);
glVertex3d(x2, y1, z1);
glVertex3d(x2, y1, z2);

glVertex3d(x1, y2, z1);
glVertex3d(x2, y2, z1);
glVertex3d(x1, y2, z1);
glVertex3d(x1, y2, z2);

glVertex3d(x1, y1, z2);
glVertex3d(x2, y1, z2);
glVertex3d(x1, y1, z2);
glVertex3d(x1, y2, z2);

glVertex3d(x2, y2, z1);
glVertex3d(x2, y2, z2);
glVertex3d(x2, y1, z2);
glVertex3d(x2, y2, z2);
glVertex3d(x1, y2, z2);
glVertex3d(x2, y2, z2);

glEnd();
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/foxdenstudio/sponge/foxcore/plugin/FoxCoreMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
@Plugin(id = "foxcore", name = "FoxCore", version = FoxCoreMain.VERSION)
public final class FoxCoreMain {

public static final String VERSION = "0.4.2-SNAPSHOT";//VERSION
public static final String VERSION = "0.6.0-SNAPSHOT";//VERSION

private static FoxCoreMain instance;

Expand Down

0 comments on commit 5a53c42

Please sign in to comment.