Merge branch 'new' of https://github.com/ThisIsALegitUsername/Resent-1.8 into new

src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/internal/PlatformAudio.java

@@ -130,8 +130,9 @@ public class PlatformAudio {
 
                     public void errorMessage(String parString1, String parString2, int parInt1) {
                         if (!parString2.isEmpty()) {
-                            logger.error("Error in class \"{}\"!", parString1);
+                        	// stfu pls
-                            logger.error(parString2);
+                            //logger.error("Error in class \"{}\"!", parString1);
+                            //logger.error(parString2);
                         }
                     }
                 }

src/main/java/dev/resent/util/misc/TimerUtil.java

@@ -0,0 +1,26 @@
+package dev.resent.util.misc;
+
+public class TimerUtil {
+    private static long halfSecond = 500000000;
+    private long lastTime;
+
+    private long getDeltaTime(){
+        return (System.nanoTime()-lastTime);
+    }
+
+    private void updateTime(){
+        this.lastTime = System.nanoTime();
+    }
+
+    public TimerUtil() {
+        this.lastTime = System.nanoTime();
+    }
+
+    public boolean hasHalfSecondPassoed() {
+        if (getDeltaTime() >= halfSecond) {
+            updateTime();
+            return true;
+        }
+        else return false;
+    }
+}

src/main/java/dev/resent/visual/ui/clickgui/rewrite/ClickGuiRewrite.java

@@ -7,7 +7,6 @@ import dev.resent.client.Resent;
 import dev.resent.module.base.Mod;
 import dev.resent.module.base.setting.BooleanSetting;
 import dev.resent.module.base.setting.Setting;
-import dev.resent.util.misc.FuncUtils;
 import dev.resent.util.misc.GlUtils;
 import dev.resent.util.render.Color;
 import dev.resent.util.render.RenderUtils;
@@ -25,159 +24,173 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.EntityRenderer;
 import net.minecraft.util.ChatAllowedCharacters;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 
-public class ClickGuiRewrite extends GuiScreen{
+public class ClickGuiRewrite extends GuiScreen {
 
-	public FontRenderer fr;
+    public FontRenderer fr;
-    public ArrayList<Comp> comps = new ArrayList<>();
+    public ArrayList < Comp > comps = new ArrayList < > ();
     public float x, y, width, height;
     public Animation introAnimation;
     public ScaledResolution sr;
-    public boolean closing;
+    public boolean closing, isSearchFocused;
     public Mod selectedMod;
     public String searchString = "";
     public SimpleAnimation partAnimation = new SimpleAnimation(0);
     public int backgroundColor = new Color(18, 18, 18).getRGB(),
-    		   primaryColor = 0xFF000000,
+        primaryColor = 0xFF000000,
-    		   secondaryColor = new Color(33, 33, 33).getRGB(),
+        secondaryColor = new Color(33, 33, 33).getRGB(),
-    		   onSurfaceColor = new Color(3, 218, 197).getRGB(),
+        onSurfaceColor = new Color(3, 218, 197).getRGB(),
-    		   secondaryFontColor = new Color(187, 134, 252).getRGB();
+        secondaryFontColor = new Color(187, 134, 252).getRGB();
     public int partOffset = 0, scrollOffset = 0;
     public String part = "Home";
 
     @Override
     public void drawScreen(int mouseX, int mouseY, float var3) {
-    	
+
-    	int offset = 0;
+        int offset = 0;
-    	
+
         GlUtils.startScale((this.x + this.width) / 2, (this.y + this.height) / 2, introAnimation != null ? (float) introAnimation.getValue() : 1);
 
         //Navigation bar
-        RenderUtils.drawRoundedRect(x, y, x+width-60, y+height, 32, secondaryColor);
+        RenderUtils.drawRoundedRect(x, y, x + width - 60, y + height, 32, secondaryColor);
-        
+
         //Background overlay
-        RenderUtils.drawRoundedRect(x+60, y, x+width, y+height, 32, backgroundColor);
+        RenderUtils.drawRoundedRect(x + 60, y, x + width, y + height, 32, backgroundColor);
-        Gui.drawRect(x+60, y, x+102, y+height, backgroundColor);
+        Gui.drawRect(x + 60, y, x + 102, y + height, backgroundColor);
-        
+
-        //Seperating line
+        //Separating line
-        Gui.drawRect(x, y+90, x+width, y+95, secondaryColor);
+        Gui.drawRect(x, y + 90, x + width, y + 95, secondaryColor);
-        
+
         //Title
         GlStateManager.pushMatrix();
-        GlStateManager.translate(x+80, y+36, 0);
+        GlStateManager.translate(x + 80, y + 36, 0);
-        GlStateManager.scale(3.5f, 3.5f, 1);
+        GlStateManager.scale(3.5F, 3.5F, 1);
-        GlStateManager.translate(-(x+80), -(y+36), 0);
+        GlStateManager.translate(-(x + 80), -(y + 36), 0);
-        fr.drawString("Resent", x+80, y+36, -1, false);
+        fr.drawString("Resent", x + 80, y + 36, -1, false);
         GlStateManager.popMatrix();
-        
+
         //Navigation selection
-        RenderUtils.drawRoundedRect(x+15, (int)y+115+partAnimation.getValue(), x+45, y+145+partAnimation.getValue(), 8, secondaryFontColor);
+        RenderUtils.drawRoundedRect(x + 15, (int) y + 115 + partAnimation.getValue(), x + 45, y + 145 + partAnimation.getValue(), 8, secondaryFontColor);
-        
+
         //Navigation icons
-        GlStateManager.color(1,  1,  1);
+        GlStateManager.color(1, 1, 1);
-        mc.getTextureManager().bindTexture(new ResourceLocation("/resent/house.png"));
+        mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/house.png"));
-        Gui.drawModalRectWithCustomSizedTexture(x+20, (int)y+120, 0, 0, 20, 20, 20, 20);
+        Gui.drawModalRectWithCustomSizedTexture(x + 20, (int) y + 120, 0, 0, 20, 20, 20, 20);
-        mc.getTextureManager().bindTexture(new ResourceLocation("/resent/gear.png"));
+        mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear2.png"));
-        Gui.drawModalRectWithCustomSizedTexture(x+20, (int)y+170, 0, 0, 20, 20, 20, 20);
+        Gui.drawModalRectWithCustomSizedTexture(x + 20, (int) y + 170, 0, 0, 20, 20, 20, 20);
-        
+
         //Search
-        RenderUtils.drawRoundedRect(x+width-300, y+25, x+width-50, y+65, 9, secondaryColor);
+        RenderUtils.drawRoundedRect(x + width - 300, y + 25, x + width - 50, y + 65, 9, secondaryColor);
+
+
         GlStateManager.pushMatrix();
-        GlStateManager.translate(x+width-290, y+40, 0);
+        GlStateManager.translate(x + width - 290, y + 40, 0);
-        GlStateManager.scale(1.5f, 1.5f, 1);
+        GlStateManager.scale(1.5F, 1.5F, 1);
-        GlStateManager.translate(-(x+width-290), -(y+40), 0);
+        GlStateManager.translate(-(x + width - 290), -(y + 40), 0);
-        if(searchString.length() > 0) {
+        if (searchString.length() > 0) {
-        	fr.drawString(searchString, x+width-290, y+40, secondaryFontColor, false);
+            fr.drawString(searchString, x + width - 290, y + 40, secondaryFontColor, false);
-        }else {
+        } else {
-        	fr.drawString("Search", x+width-290, y+40, new Color(97, 97, 97).getRGB(), false);
+            fr.drawString(EnumChatFormatting.ITALIC + "Search", x + width - 290, y + 40, new Color(97, 97, 97).getRGB(), false);
         }
+
+        if (isSearchFocused) {
+            drawRect(x + width - 290 + fr.getStringWidth(searchString), y + 38, x + width - 289 + fr.getStringWidth(searchString), y + 50, secondaryFontColor);
+        }
+
         GlStateManager.popMatrix();
-        
+
         //Draw module button
-        for(Mod m : Resent.INSTANCE.modManager.modules){
+        for (Mod m: Resent.INSTANCE.modManager.modules) {
-        	if(!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
+            if (!m.isAdmin() && m.getName().toLowerCase().startsWith(searchString.toLowerCase()) && selectedMod == null) {
-        		
+
-        		if(y+115+offset+scrollOffset > y+95 && y+185+offset+scrollOffset < y+height) {
+                if (y + 115 + offset + scrollOffset > y + 95 && y + 185 + offset + scrollOffset < y + height) {
-        		//Body
+                    //Body
-        		RenderUtils.drawRoundedRect(x+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset, 16, secondaryColor);
+                    RenderUtils.drawRoundedRect(x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset, 16, secondaryColor);
-        		
+
-        		//Gear
+                    //Gear
-        		if(m.doesHaveSetting()) {
+                    if (m.doesHaveSetting()) {
-	        		GlStateManager.color(1, 1, 1);
+                        GlStateManager.color(1, 1, 1);
-	        		mc.getTextureManager().bindTexture(new ResourceLocation("/resent/gear.png"));
+                        mc.getTextureManager().bindTexture(new ResourceLocation("eagler:gui/gear2.png"));
-	        		Gui.drawModalRectWithCustomSizedTexture(x+width-60, (int)y+140+offset+scrollOffset, 0, 0, 20, 20, 20, 20);
+                        Gui.drawModalRectWithCustomSizedTexture(x + width - 60, (int) y + 140 + offset + scrollOffset, 0, 0, 20, 20, 20, 20);
-        		}
+                    }
-            	//RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1);
+                    //RenderUtils.drawRoundedRect(x+width-60, y+140+offset, x+width-40, y+160+offset, 4, -1);
-            	
+
-            	//Toggle
+                    //Toggle
-            	RenderUtils.drawRoundedRect(x+90, y+125+offset+scrollOffset, x+140, y+175+offset+scrollOffset, 8, new Color(66, 66, 66).getRGB());
+                    RenderUtils.drawRoundedRect(x + 90, y + 125 + offset + scrollOffset, x + 140, y + 175 + offset + scrollOffset, 8, new Color(66, 66, 66).getRGB());
-            	
+
-        		GlUtils.startScale(x+90, y+140+offset+scrollOffset, 2);
+                    GlUtils.startScale(x + 90, y + 140 + offset + scrollOffset, 2);
-        		fr.drawString(m.getName(), x+120, y+140+offset+scrollOffset, -1, false);
+                    fr.drawString(m.getName(), x + 120, y + 140 + offset + scrollOffset, -1, false);
-        		GlStateManager.popMatrix();
+                    GlStateManager.popMatrix();
-        		
+
-        		if(isMouseInside(mouseX, mouseY, x+80, y+115+offset+scrollOffset, x+width-20, y+185+offset+scrollOffset)) {
+                    if (isMouseInside(mouseX, mouseY, x + 80, y + 115 + offset + scrollOffset, x + width - 20, y + 185 + offset + scrollOffset)) {
-        			fr.drawString(m.getDescription(), mouseX+8, mouseY, onSurfaceColor, false);
+                        fr.drawString(m.getDescription(), mouseX + 8, mouseY, onSurfaceColor, false);
-        		}
+                    }
-        		
+
-        		}
+                }
-            	offset += 80;
+                offset += 80;
-        	}
+            }
         }
 
         GlStateManager.popMatrix();
 
-        if(selectedMod != null){
+        if (selectedMod != null) {
-            for (Comp comp : comps) {
+            for (Comp comp: comps) {
                 comp.drawScreen(mouseX, mouseY);
             }
         }
 
         if (closing) {
             comps.clear();
-        	if(introAnimation == null) {
+            if (introAnimation == null) {
-        		mc.displayGuiScreen(null);
+                mc.displayGuiScreen(null);
-        		return;
+                return;
-        	}
+            }
-        		
+
             introAnimation.setDirection(Direction.BACKWARDS);
             if (introAnimation.isDone(Direction.BACKWARDS)) {
                 mc.displayGuiScreen(null);
             }
         }
+
     }
 
     @Override
     protected void mouseClicked(int mouseX, int mouseY, int mouseButton) {
-    	
-    if(isMouseInside(mouseX, mouseY, x+20, (int)y+170, x+40, (int)y+190)) {
-    	partAnimation.setAnimation(50-partOffset, 10);
-    }else if(isMouseInside(mouseX, mouseY, x+20, (int)y+120, x+40, (int)y+140)) {
-    	partAnimation.setAnimation(0-partOffset, 10);
-    }
 
-    	int offset = 0;
+        if (isMouseInside(mouseX, mouseY, x + 20, (int) y + 170, x + 40, (int) y + 190)) {
-    	
+            partAnimation.setAnimation(50 - partOffset, 10);
-        for(Mod m : Resent.INSTANCE.modManager.modules){
+        } else if (isMouseInside(mouseX, mouseY, x + 20, (int) y + 120, x + 40, (int) y + 140)) {
-           	if(!m.isAdmin()) {
+            partAnimation.setAnimation(0 - partOffset, 10);
-	            if(isMouseInside(mouseX, mouseY, x+width-60, y+140+offset, x+width-40, y+160+offset) && mouseButton == 0 && m.doesHaveSetting()){
-	                for(Setting s : m.settings){
-	                    if(s instanceof BooleanSetting){
-	                        comps.add(new CompCheck(4, 4, selectedMod, s));
-	                    }
-	                }
-	            }
-
-	            offset += 80;
-           	}
         }
 
-        if(selectedMod != null){
+        if (isMouseInside(mouseX, mouseY, x + width - 300, y + 25, x + width - 50, y + 65)) {
-            for(Comp c : comps){
+            isSearchFocused = true;
+        } else {
+            isSearchFocused = false;
+        }
+
+        int offset = 0;
+
+        for (Mod m: Resent.INSTANCE.modManager.modules) {
+            if (!m.isAdmin()) {
+                if (isMouseInside(mouseX, mouseY, x + width - 60, y + 140 + offset, x + width - 40, y + 160 + offset) && mouseButton == 0 && m.doesHaveSetting()) {
+                    for (Setting s: m.settings) {
+                        if (s instanceof BooleanSetting) {
+                            comps.add(new CompCheck(4, 4, selectedMod, s));
+                        }
+                    }
+                }
+
+                offset += 80;
+            }
+        }
+
+        if (selectedMod != null) {
+            for (Comp c: comps) {
                 c.mouseClicked(mouseX, mouseY, mouseButton);
             }
         }
@@ -187,11 +200,11 @@ public class ClickGuiRewrite extends GuiScreen{
     @Override
     public void initGui() {
         sr = new ScaledResolution(mc);
-        x = sr.getScaledWidth()/10;
+        x = sr.getScaledWidth() / 10;
-        y = sr.getScaledHeight()/10;
+        y = sr.getScaledHeight() / 10;
-        width = sr.getScaledWidth()/1.25f;
+        width = sr.getScaledWidth() / 1.25F;
-        height = sr.getScaledHeight()/1.25f;
+        height = sr.getScaledHeight() / 1.25F;
-        introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false);
+        introAnimation = Theme.getAnimation(500, 1, 3, 3.8F, 1.35F, false);
         fr = mc.fontRendererObj;
     }
 
@@ -201,47 +214,46 @@ public class ClickGuiRewrite extends GuiScreen{
             closing = true;
         }
 
-        if(selectedMod != null){
+        if (selectedMod != null) {
-            for(Comp c : comps){
+            for (Comp c: comps) {
                 c.keyTyped(par1, key);
             }
         }
-        
+
         // Search box stuff
-        else if(key == KeyboardConstants.KEY_BACK) {
+        else if (key == KeyboardConstants.KEY_BACK && isSearchFocused) {
-        	if(searchString.length() != 0) {
+            if (searchString.length() != 0) {
-        		searchString = searchString.substring(0, searchString.length()-1);
+                searchString = searchString.substring(0, searchString.length() - 1);
-        	}
+            }
-        }else {
+        } else {
-        	if(searchString.length() <= 18) {
+            if (searchString.length() <= 18 && isSearchFocused) {
-        		String balls = ChatAllowedCharacters.filterAllowedCharacters(String.valueOf(par1));
+                String balls = ChatAllowedCharacters.filterAllowedCharacters(String.valueOf(par1));
-        		if(balls != null && balls != "") {
+                if (balls != null && balls != "") {
-        			searchString += String.valueOf(par1);
+                    searchString += String.valueOf(par1);
-        			scrollOffset = 0;
+                    scrollOffset = 0;
-        		}
+                }
-        	}
+            }
         }
-        
     }
 
+
     @Override
-	public void handleMouseInput() throws IOException {
+    public void handleMouseInput() throws IOException {
-    	int scroll = Mouse.getEventDWheel();
+        int scroll = Mouse.getEventDWheel();
-    	
-    	if(scroll > 0) {
-    		scrollOffset = MathHelper.clamp_int(scrollOffset+80, getMaxScroll(), 0);
-    	}else if(scroll < 0) {
-    		scrollOffset = MathHelper.clamp_int(scrollOffset-80, getMaxScroll(), 0);
-    	}
-		super.handleMouseInput();
-	}
 
-	public boolean isMouseInside(double mouseX, double mouseY, double x, double y, double width, double height) {
+        if (scroll > 0) {
+            scrollOffset = MathHelper.clamp_int(scrollOffset + 80, getMaxScroll(), 0);
+        } else if (scroll < 0) {
+            scrollOffset = MathHelper.clamp_int(scrollOffset - 80, getMaxScroll(), 0);
+        }
+        super.handleMouseInput();
+    }
+
+    public boolean isMouseInside(double mouseX, double mouseY, double x, double y, double width, double height) {
         return (mouseX >= x && mouseX <= width) && (mouseY >= y && mouseY <= height);
     }
-	
+
-	public int getMaxScroll() {
+    public int getMaxScroll() {
-		return Resent.INSTANCE.modManager.modules.size() * -68;
+        return Resent.INSTANCE.modManager.modules.size() * -69;
-	}
+    }
-    
+}
-}

src/main/java/net/minecraft/client/gui/ScaledResolution.java

@@ -53,6 +53,26 @@ public class ScaledResolution {
         this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD);
     }
 
+    public ScaledResolution(Minecraft parMinecraft, int uwu) {
+        this.scaledWidth = parMinecraft.displayWidth;
+        this.scaledHeight = parMinecraft.displayHeight;
+        this.scaleFactor = 1;
+        boolean flag = parMinecraft.isUnicode();
+
+        while (this.scaleFactor < uwu && this.scaledWidth / (this.scaleFactor + 1) >= 320 && this.scaledHeight / (this.scaleFactor + 1) >= 240) {
+            ++this.scaleFactor;
+        }
+
+        if (flag && this.scaleFactor % 2 != 0 && this.scaleFactor != 1) {
+            --this.scaleFactor;
+        }
+
+        this.scaledWidthD = (double) this.scaledWidth / (double) this.scaleFactor;
+        this.scaledHeightD = (double) this.scaledHeight / (double) this.scaleFactor;
+        this.scaledWidth = MathHelper.ceiling_double_int(this.scaledWidthD);
+        this.scaledHeight = MathHelper.ceiling_double_int(this.scaledHeightD);
+    }
+
     public int getScaledWidth() {
         return this.scaledWidth;
     }