Skip to content

Update to 1.9 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevpgoff wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update to 1.9 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac51277
Updated to 1.9
kevpgoff May 6, 2016
af894f0
Updated to 1.9
kevpgoff May 6, 2016
7775f4f
Added files via upload
kevpgoff May 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions src/main/java/com/biggestnerd/civradar/RenderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
Expand Down Expand Up @@ -48,7 +48,7 @@ public RenderHandler() {

@SubscribeEvent
public void renderRadar(RenderGameOverlayEvent event) {
if(event.type != RenderGameOverlayEvent.ElementType.CROSSHAIRS)
if(event.getType() != RenderGameOverlayEvent.ElementType.CROSSHAIRS)
return;
if(config.isEnabled()) {
drawRadar();
Expand All @@ -72,7 +72,7 @@ public void onTick(ClientTickEvent event) {
ArrayList<String> temp = (ArrayList)newInRangePlayers.clone();
newInRangePlayers.removeAll(inRangePlayers);
for(String name : newInRangePlayers) {
mc.theWorld.playSound(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ, "minecraft:note.pling", config.getPingVolume(), 1.0F, false);
//mc.theWorld.playSound(mc.thePlayer.posX, mc.thePlayer.posY, mc.thePlayer.posZ, "minecraft:note.pling", config.getPingVolume(), 1.0F, false);
}
inRangePlayers = temp;
}
Expand All @@ -85,7 +85,7 @@ public void renderWaypoints(RenderWorldLastEvent event) {
}
if(config.isRenderWaypoints()) {
for(Waypoint point : CivRadar.instance.getWaypointSave().getWaypoints()) {
if(point.getDimension() == mc.theWorld.provider.getDimensionId() && point.isEnabled()) {
if(point.getDimension() == mc.theWorld.provider.getDimension() && point.isEnabled()) {
renderWaypoint(point, event);
}
}
Expand All @@ -95,7 +95,7 @@ public void renderWaypoints(RenderWorldLastEvent event) {
private void drawRadar() {
radarColor = config.getRadarColor();
radarScale = config.getRadarScale();
ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
ScaledResolution res = new ScaledResolution(mc);
int width = res.getScaledWidth();
GL11.glPushMatrix();
GL11.glTranslatef(width - (65 * radarScale) + (config.getRadarX()), (65 * radarScale) + (config.getRadarY()), 0.0F);
Expand Down Expand Up @@ -278,12 +278,12 @@ private void renderIcon(int x, int y, ResourceLocation resource) {
private void renderWaypoint(Waypoint point, RenderWorldLastEvent event) {
String name = point.getName();
Color c = point.getColor();
float partialTickTime = event.partialTicks;
float partialTickTime = event.getPartialTicks();
double distance = point.getDistance(mc);
if(distance <= config.getMaxWaypointDistance() || config.getMaxWaypointDistance() < 0) {
FontRenderer fr = mc.fontRendererObj;
Tessellator tess = Tessellator.getInstance();
WorldRenderer wr = tess.getWorldRenderer();
VertexBuffer wr = tess.getBuffer();
RenderManager rm = mc.getRenderManager();

float playerX = (float) (mc.thePlayer.lastTickPosX + (mc.thePlayer.posX - mc.thePlayer.lastTickPosX) * partialTickTime);
Expand Down Expand Up @@ -312,13 +312,22 @@ private void renderWaypoint(Waypoint point, RenderWorldLastEvent event) {
int width = fr.getStringWidth(name);
int height = 10;
GL11.glDisable(GL11.GL_TEXTURE_2D);
wr.startDrawingQuads();

//wr.startDrawingQuads();
int stringMiddle = width / 2;
wr.setColorRGBA_F(c.getRed() / 255.0F, c.getGreen() / 255.0F, c.getBlue() / 255.0F, config.getWaypointOpcaity());
wr.addVertex(-stringMiddle - 1, -1, 0.0D);
wr.addVertex(-stringMiddle - 1, 1 + height, 0.0D);
wr.addVertex(stringMiddle + 1, 1 + height, 0.0D);
wr.addVertex(stringMiddle + 1, -1, 0.0D);
//wr.setColorRGBA_F(c.getRed() / 255.0F, c.getGreen() / 255.0F, c.getBlue() / 255.0F, config.getWaypointOpcaity());
//wr.addVertex(-stringMiddle - 1, -1, 0.0D);
//wr.addVertex(-stringMiddle - 1, 1 + height, 0.0D);
//wr.addVertex(stringMiddle + 1, 1 + height, 0.0D);
//wr.addVertex(stringMiddle + 1, -1, 0.0D);

wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
wr.putColorRGB_F(c.getRed() / 255.0F, c.getGreen() / 255.0F, c.getBlue() / 255.0F, (int) config.getWaypointOpcaity());
wr.pos(-stringMiddle - 1, -1, 0.0D).endVertex();
wr.pos(-stringMiddle - 1, 1 + height, 0.0D).endVertex();
wr.pos(stringMiddle + 1, 1 + height, 0.0D).endVertex();
wr.pos(stringMiddle + 1, -1, 0.0D).endVertex();

tess.draw();
GL11.glEnable(GL11.GL_TEXTURE_2D);

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/biggestnerd/civradar/Waypoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.awt.Color;

import net.minecraft.client.Minecraft;
import net.minecraft.util.MathHelper;
import net.minecraft.util.math.MathHelper;

public class Waypoint {

Expand All @@ -22,7 +22,7 @@ public Waypoint(int x, int y, int z, String name, Color c, boolean enabled) {
this.green = c.getGreen() / 255.0F;
this.blue = c.getBlue() / 255.0F;
if (Minecraft.getMinecraft().theWorld != null)
this.dimension = Minecraft.getMinecraft().theWorld.provider.getDimensionId();
this.dimension = Minecraft.getMinecraft().theWorld.provider.getDimension();
this.enabled = enabled;
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/biggestnerd/civradar/gui/GuiAddWaypoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.client.renderer.entity.RenderManager;

import org.lwjgl.input.Keyboard;
Expand Down