3rdparty/resent-1.8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clickgui rewrite rects, fonts

Browse Source
This commit is contained in:
ThisIsALegitUsername 2023-04-04 08:03:28 -06:00
parent 383169588d
commit 1bab37badf
7 changed files with 11535 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5762
desktopRuntime/resources/assets/minecraft/font/default.json Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
desktopRuntime/resources/assets/minecraft/font/glyph_sizes.bin
View File

Binary file not shown.

5739
desktopRuntime/resources/assets/minecraft/font/uniform.json Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
desktopRuntime/resources/assets/minecraft/textures/font/uwufont.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

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

@ -21,22 +21,27 @@ 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.ResourceLocation;
public class ClickGuiRewrite extends GuiScreen{
public FontRenderer fr;
public ArrayList<Comp> comps = new ArrayList<>();
public float x, y, width, height, offset;
public float x, y, width, height, moduleOffset;
public Animation introAnimation;
public ScaledResolution sr;
public boolean closing;
public Mod selectedMod;
public String searchString = "";
public int backgroundColor = new Color(12, 12, 12).getRGB(), primaryColor = 0xFF000000, secondaryColor = new Color(22, 22, 22).getRGB(), secondaryFontColor = new Color(187, 134, 252).getRGB();
public int backgroundColor = new Color(18, 18, 18).getRGB(), primaryColor = 0xFF000000, secondaryColor = new Color(33, 33, 33).getRGB(), secondaryFontColor = new Color(187, 134, 252).getRGB();
@Override
public void drawScreen(int mouseX, int mouseY, float var3) {
int offset = 0;
GlUtils.startScale((this.x + this.width) / 2, (this.y + this.height) / 2, introAnimation != null ? (float) introAnimation.getValue() : 1);
//Navigation bar
@ -50,7 +55,7 @@ public class ClickGuiRewrite extends GuiScreen{
Gui.drawRect(x, y+90, x+width, y+95, secondaryColor);
//Search
RenderUtils.drawRoundedRect(x+width-300, y+25, x+width-50, y+65, 9, new Color(22, 22, 22).getRGB());
RenderUtils.drawRoundedRect(x+width-300, y+25, x+width-50, y+65, 9, secondaryColor);
GlStateManager.pushMatrix();
GlStateManager.translate(x+width-295, y+36, 0);
GlStateManager.scale(2, 2, 1);
@ -77,7 +82,14 @@ public class ClickGuiRewrite extends GuiScreen{
//Draw module button
for(Mod m : Resent.INSTANCE.modManager.modules){
if(selectedMod == null && y+170+offset < y+height && !m.isAdmin() || selectedMod == null && y+170+offset < y+height && EntityRenderer.test) {
RenderUtils.drawRoundedRect(x+80, y+120+offset, x+width-20, y+180+offset, 8, secondaryColor);
GlUtils.startScale(x+90, y+140+offset, 3);
fr.drawString(m.getName(), x+90, y+140+offset, -1, false);
GlStateManager.popMatrix();
offset+= 80;
}
}
GlUtils.stopScale();
@ -134,7 +146,7 @@ public class ClickGuiRewrite extends GuiScreen{
width = sr.getScaledWidth()/1.25f;
height = sr.getScaledHeight()/1.25f;
introAnimation = Theme.getAnimation(500, 1, 3, 3.8f, 1.35f, false);
fr = mc.fontRendererObj;
fr = mc.uwuFont;
}
@Override
@ -147,14 +159,21 @@ public class ClickGuiRewrite extends GuiScreen{
for(Comp c : comps){
c.keyTyped(par1, key);
}
}else if(key == KeyboardConstants.KEY_BACK) {
}
// Search box stuff
else if(key == KeyboardConstants.KEY_BACK) {
if(searchString.length() != 0) {
searchString = searchString.substring(0, searchString.length()-1);
}
}else {
if(searchString.length() <= 18)
searchString += String.valueOf(par1);
if(searchString.length() <= 18) {
String balls = ChatAllowedCharacters.filterAllowedCharacters(String.valueOf(par1));
if(balls != null && balls != "")
searchString += String.valueOf(par1);
}
}
}
public boolean isMouseInside(double mouseX, double mouseY, double x, double y, double width, double height) {

6
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -214,6 +214,7 @@ public class Minecraft implements IThreadListener {
private boolean isGamePaused;
public FontRenderer fontRendererObj;
public FontRenderer standardGalacticFontRenderer;
public FontRenderer uwuFont;
public GuiScreen currentScreen;
public LoadingScreenRenderer loadingScreen;
public EntityRenderer entityRenderer;
@ -390,15 +391,20 @@ public class Minecraft implements IThreadListener {
this.mcMusicTicker = new MusicTicker(this);
this.fontRendererObj = new EaglerFontRenderer(this.gameSettings,
new ResourceLocation("textures/font/ascii.png"), this.renderEngine, false);
this.uwuFont = new EaglerFontRenderer(this.gameSettings,
new ResourceLocation("textures/font/uwufont.png"), this.renderEngine, false);
if (this.gameSettings.language != null) {
this.fontRendererObj.setUnicodeFlag(this.isUnicode());
this.fontRendererObj.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
this.uwuFont.setUnicodeFlag(this.isUnicode());
this.uwuFont.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional());
}
this.standardGalacticFontRenderer = new EaglerFontRenderer(this.gameSettings,
new ResourceLocation("textures/font/ascii_sga.png"), this.renderEngine, false);
this.mcResourceManager.registerReloadListener(this.fontRendererObj);
this.mcResourceManager.registerReloadListener(this.standardGalacticFontRenderer);
this.mcResourceManager.registerReloadListener(this.uwuFont);
this.mcResourceManager.registerReloadListener(new GrassColorReloadListener());
this.mcResourceManager.registerReloadListener(new FoliageColorReloadListener());
AchievementList.openInventory.setStatStringFormatter(new IStatStringFormat() {

2
src/main/java/net/minecraft/client/settings/GameSettings.java
View File

@ -231,7 +231,7 @@ public class GameSettings {
this.fovSetting = 70.0F;
this.gammaSetting = 1.0F;
this.language = EagRuntime.getConfiguration().getDefaultLocale();
this.forceUnicodeFont = false;
this.forceUnicodeFont = true;
this.mc = mcIn;
ModManager.scoreboard.setEnabled(true);
GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);