Skip to content
This repository has been archived by the owner on Oct 14, 2018. It is now read-only.

Commit

Permalink
Do things
Browse files Browse the repository at this point in the history
  • Loading branch information
VXLBot committed Jun 18, 2018
1 parent 81da068 commit 0c81436
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 44 deletions.
3 changes: 3 additions & 0 deletions build.gradle
Expand Up @@ -20,6 +20,7 @@ plugins {
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.selesse.git.changelog'
apply plugin: 'java'

def BUILD_NUMBER = System.getenv("BUILD_NUMBER") ?: "0"
def mod_version = "0.6.0.$BUILD_NUMBER"
Expand Down Expand Up @@ -82,6 +83,7 @@ minecraft {
}

repositories {
mavenCentral()
maven {
name "tterrag"
url "http://maven.tterrag.com"
Expand All @@ -98,6 +100,7 @@ dependencies {
provided "team.chisel.ctm:CTM:MC1.12-0.2.3.12"
deobfProvided "mezz.jei:jei_1.12.2:4.8.5.138:api"
runtime "mezz.jei:jei_1.12.2:4.8.5.138"
compile group: 'org.projectlombok', name: 'lombok', version: '1.16.20'

deobfCompile group: 'mcp.mobius.waila', name: 'Hwyla', version: '1.8.23-B38_1.12'
}
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/matteroverdrive/Reference.java
Expand Up @@ -17,8 +17,11 @@
*/
package matteroverdrive;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import matteroverdrive.client.data.Color;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class Reference {
public static final String MOD_ID = "matteroverdrive";
public static final String MOD_NAME = "MatterOverdrive";
Expand Down Expand Up @@ -114,8 +117,4 @@ public final class Reference {
public static final String UNICODE_LEGENDARY = "\u272a";
public static final String UNICODE_COMPLETED_OBJECTIVE = "\u25a0";
public static final String UNICODE_UNCOMPLETED_OBJECTIVE = "\u25a1";

private Reference() {
}

}
14 changes: 7 additions & 7 deletions src/main/java/matteroverdrive/util/RenderUtils.java
Expand Up @@ -130,17 +130,17 @@ public static void renderItemOverlayIntoGUI(FontRenderer fr, ItemStack stack, in
}
}

private static void func_181565_a(BufferBuilder p_181565_1_, int p_181565_2_, int p_181565_3_, int p_181565_4_, int p_181565_5_, int p_181565_6_, int p_181565_7_, int p_181565_8_, int p_181565_9_) {
p_181565_1_.begin(7, DefaultVertexFormats.POSITION_COLOR);
p_181565_1_.pos((double) (p_181565_2_ + 0), (double) (p_181565_3_ + 0), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
p_181565_1_.pos((double) (p_181565_2_ + 0), (double) (p_181565_3_ + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
p_181565_1_.pos((double) (p_181565_2_ + p_181565_4_), (double) (p_181565_3_ + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
p_181565_1_.pos((double) (p_181565_2_ + p_181565_4_), (double) (p_181565_3_ + 0), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
private static void func_181565_a(BufferBuilder bufferBuilder, int posX, int posY, int p_181565_4_, int p_181565_5_, int p_181565_6_, int p_181565_7_, int p_181565_8_, int p_181565_9_) {
bufferBuilder.begin(7, DefaultVertexFormats.POSITION_COLOR);
bufferBuilder.pos((double) (posX), (double) (posY), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
bufferBuilder.pos((double) (posX), (double) (posY + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
bufferBuilder.pos((double) (posX + p_181565_4_), (double) (posY + p_181565_5_), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
bufferBuilder.pos((double) (posX + p_181565_4_), (double) (posY), 0.0D).color(p_181565_6_, p_181565_7_, p_181565_8_, p_181565_9_).endVertex();
Tessellator.getInstance().draw();
}

public static void renderStack(int x, int y, ItemStack stack, float opacity) {
if (!stack.isEmpty() && stack.getItem() != null) {
if (!StackUtils.isNullOrEmpty(stack)) {
GlStateManager.color(1, 1, 1);
GlStateManager.disableCull();
GlStateManager.depthMask(true);
Expand Down
41 changes: 8 additions & 33 deletions src/main/java/matteroverdrive/util/Vector3.java
Expand Up @@ -17,20 +17,19 @@
*/
package matteroverdrive.util;

import lombok.Getter;
import lombok.Setter;
import net.minecraft.util.math.MathHelper;

public class Vector3 {
/**
* X inate of Vec3D
*/
@Getter
@Setter
public double x;
/**
* Y inate of Vec3D
*/
@Getter
@Setter
public double y;
/**
* Z inate of Vec3D
*/
@Getter
@Setter
public double z;

public Vector3(double x, double y, double z) {
Expand Down Expand Up @@ -116,30 +115,6 @@ public Vector3 set(double x, double y, double z) {
return this;
}

public double getX() {
return x;
}

public void setX(double x) {
this.x = x;
}

public double getY() {
return y;
}

public void setY(double y) {
this.y = y;
}

public double getZ() {
return z;
}

public void setZ(double z) {
this.z = z;
}

/**
* Rotates the vector around the x axis by the specified angle.
*/
Expand Down

0 comments on commit 0c81436

Please sign in to comment.