Skip to content

Commit 546caa0

Browse files
author
Michael Hillcox
committed
Verions update to 1.9.4
2 parents c9ff55d + fb66e9e commit 546caa0

2 files changed

Lines changed: 30 additions & 32 deletions

File tree

java/com/fgtXray/client/RenderTick.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public void onWorldRenderLast( RenderWorldLastEvent event ) // Called when drawi
3838
float mx = (float)mc.thePlayer.prevPosX;
3939
float my = (float)mc.thePlayer.prevPosY;
4040
float mz = (float)mc.thePlayer.prevPosZ;
41-
float dx = mx + ( px - mx ) * f;
42-
float dy = my + ( py - my ) * f;
43-
float dz = mz + ( pz - mz ) * f;
41+
float dx = mx + ( px - mx );
42+
float dy = my + ( py - my );
43+
float dz = mz + ( pz - mz );
4444
drawOres( dx, dy, dz ); // this is a world pos of the player
4545
}
4646
}

java/com/fgtXray/client/gui/GuiSettings.java

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
1313
import net.minecraft.client.gui.GuiButton;
1414
import net.minecraft.client.gui.GuiScreen;
15-
import net.minecraft.init.SoundEvents;
1615
import net.minecraft.item.Item;
1716
import net.minecraft.item.ItemStack;
1817

@@ -122,39 +121,38 @@ public void initGui()
122121
@Override
123122
public void actionPerformed( GuiButton button )
124123
{
125-
// Called on left click of GuiButton
124+
// Called on left click of GuiButton
126125
switch(button.id)
127126
{
128127
case 99: // Print OreDict
129128
for ( String name : OreDictionary.getOreNames() ) // Print the ore dictionary.
130129
{
131-
List<ItemStack> oreStack = OreDictionary.getOres( name);
132-
System.out.print( String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size() ) );
130+
List<ItemStack> oreStack = OreDictionary.getOres(name);
131+
System.out.print(String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size()));
133132
StringBuilder idMetaCsv = new StringBuilder();
134-
if( oreStack.size() < 1 )
135-
{
136-
idMetaCsv.append( " )" );
137-
}
138-
139-
for( ItemStack stack : oreStack )
140-
{
141-
if( stack == oreStack.get( oreStack.size() - 1 ) )
142-
{
143-
idMetaCsv.append( String.format( "%d:%d )", Item.getIdFromItem( stack.getItem() ), stack.getItemDamage() ) );
133+
if (oreStack.size() < 1) {
134+
List<ItemStack> oreStack = OreDictionary.getOres(name);
135+
System.out.print(String.format("[OreDict] %-40.40s [%d types] ( ", name, oreStack.size()));
136+
StringBuilder idMetaCsv = new StringBuilder();
137+
if (oreStack.size() < 1) {
138+
idMetaCsv.append(" )");
144139
}
145-
else
146-
{
147-
idMetaCsv.append( String.format( "%d:%d, ", Item.getIdFromItem( stack.getItem() ), stack.getItemDamage() ) );
140+
141+
for (ItemStack stack : oreStack) {
142+
if (stack == oreStack.get(oreStack.size() - 1)) {
143+
idMetaCsv.append(String.format("%d:%d )", Item.getIdFromItem(stack.getItem()), stack.getItemDamage()));
144+
} else {
145+
idMetaCsv.append(String.format("%d:%d, ", Item.getIdFromItem(stack.getItem()), stack.getItemDamage()));
146+
}
148147
}
148+
System.out.println(idMetaCsv.toString());
149149
}
150-
System.out.println( idMetaCsv.toString() );
151-
}
152150

153-
if (!OresSearch.searchList.isEmpty()) // Print out the searchList.
154-
{
155-
for (OreInfo ore : OresSearch.searchList)
151+
if (!OresSearch.searchList.isEmpty()) // Print out the searchList.
156152
{
157-
System.out.println(String.format("[Fgt XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
153+
for (OreInfo ore : OresSearch.searchList) {
154+
System.out.println(String.format("[Fgt XRay] OreInfo( %s, %d, %d, 0x%x, %b )", ore.oreName, ore.id, ore.meta, ore.color[0], ore.draw));
155+
}
158156
}
159157
}
160158
break;
@@ -246,12 +244,12 @@ public boolean doesGuiPauseGame()
246244
// this removes the stupid power of 2 rule that comes with minecraft.
247245
private static void drawTexturedQuadFit(double x, double y, double width, double height, double zLevel)
248246
{
249-
VertexBuffer tessellate = Tessellator.getInstance().getBuffer();
250-
tessellate.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
251-
tessellate.pos(x + 0, y + height, zLevel).tex( 0,1).endVertex();
252-
tessellate.pos(x + width, y + height, zLevel).tex( 1, 1).endVertex();
253-
tessellate.pos(x + width, y + 0, zLevel).tex( 1,0).endVertex();
254-
tessellate.pos(x + 0, y + 0, zLevel).tex( 0, 0).endVertex();
247+
VertexBuffer tessellator = Tessellator.getInstance().getBuffer();
248+
tessellator.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
249+
tessellator.pos(x + 0, y + height, zLevel).tex( 0,1).endVertex();
250+
tessellator.pos(x + width, y + height, zLevel).tex( 1, 1).endVertex();
251+
tessellator.pos(x + width, y + 0, zLevel).tex( 1,0).endVertex();
252+
tessellator.pos(x + 0, y + 0, zLevel).tex( 0, 0).endVertex();
255253
Tessellator.getInstance().draw();
256254
}
257255

0 commit comments

Comments
 (0)