Revert astolfo
This commit is contained in:
parent
c98b68cea3
commit
8e5e472dac
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -49,9 +49,6 @@ public abstract class Mod {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawRect(final int left, final int top, final int right, final int bottom, final int color){
|
protected void drawRect(final int left, final int top, final int right, final int bottom, final int color){
|
||||||
if(color == 6942069){
|
|
||||||
RenderUtils.drawChromaRectangle(left, top, right, bottom, Theme.getRounded());
|
|
||||||
}else
|
|
||||||
RenderUtils.drawRoundedRect(left, top, right, bottom, 4, color, Theme.getRounded());
|
RenderUtils.drawRoundedRect(left, top, right, bottom, 4, color, Theme.getRounded());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ import dev.resent.module.base.Mod.Category;
|
||||||
import dev.resent.module.base.RenderMod;
|
import dev.resent.module.base.RenderMod;
|
||||||
import dev.resent.module.setting.BooleanSetting;
|
import dev.resent.module.setting.BooleanSetting;
|
||||||
import dev.resent.ui.Theme;
|
import dev.resent.ui.Theme;
|
||||||
|
import dev.resent.util.render.Color;
|
||||||
import net.minecraft.util.BlockPos;
|
import net.minecraft.util.BlockPos;
|
||||||
|
|
||||||
@RenderModule(name = "Info", category = Category.HUD, x = 140, y = 50)
|
@RenderModule(name = "Info", category = Category.HUD, x = 140, y = 50)
|
||||||
|
@ -28,7 +29,7 @@ public class Info extends RenderMod {
|
||||||
int pz = (int) mc.thePlayer.posZ;
|
int pz = (int) mc.thePlayer.posZ;
|
||||||
//int rot = MathHelper.floor_double(this.mc.thePlayer.rotationYaw*4/360+0.5) & 3;
|
//int rot = MathHelper.floor_double(this.mc.thePlayer.rotationYaw*4/360+0.5) & 3;
|
||||||
if (mc.thePlayer != null) {
|
if (mc.thePlayer != null) {
|
||||||
drawRect(this.x, this.y, this.x + this.getWidth(), this.y + this.getHeight(), Theme.getRectColor(Theme.getRectId()));
|
drawRect(this.x, this.y, this.x + this.getWidth(), this.y + this.getHeight(), new Color(0, 0, 0, 200).getRGB());
|
||||||
drawString(" X: " + px, this.x + 5, this.y + 14, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
drawString(" X: " + px, this.x + 5, this.y + 14, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
||||||
drawString(" Y: " + py, this.x + 5, this.y + 24, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
drawString(" Y: " + py, this.x + 5, this.y + 24, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
||||||
drawString(" Z: " + pz, this.x + 5, this.y + 34, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
drawString(" Z: " + pz, this.x + 5, this.y + 34, Theme.getFontColor(Theme.getFontId()), Theme.getTextShadow());
|
||||||
|
|
|
@ -7,7 +7,6 @@ import dev.resent.animation.impl.EaseInOutQuad;
|
||||||
import dev.resent.animation.impl.ElasticAnimation;
|
import dev.resent.animation.impl.ElasticAnimation;
|
||||||
import dev.resent.animation.impl.SmoothStepAnimation;
|
import dev.resent.animation.impl.SmoothStepAnimation;
|
||||||
import dev.resent.module.impl.misc.HUD;
|
import dev.resent.module.impl.misc.HUD;
|
||||||
import dev.resent.util.render.Color;
|
|
||||||
import dev.resent.util.render.RenderUtils;
|
import dev.resent.util.render.RenderUtils;
|
||||||
|
|
||||||
public class Theme {
|
public class Theme {
|
||||||
|
@ -45,26 +44,6 @@ public class Theme {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getRectColor(int id){
|
|
||||||
switch(getRectId()){
|
|
||||||
case 1:
|
|
||||||
return new Color(0, 0, 0, 200).getRGB();
|
|
||||||
case 6942069:
|
|
||||||
return 6942069;
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getRectId(){
|
|
||||||
switch(HUD.rectTheme.getValue()){
|
|
||||||
case "Classic":
|
|
||||||
return 1;
|
|
||||||
case "Astolfo":
|
|
||||||
return 6942069;
|
|
||||||
}
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getFontId(){
|
public static int getFontId(){
|
||||||
switch(HUD.fontTheme.getValue()){
|
switch(HUD.fontTheme.getValue()){
|
||||||
case "Classic":
|
case "Classic":
|
||||||
|
|
|
@ -25,11 +25,11 @@ public class RenderUtils {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void drawChromaRectangle(int x, int y, int width, int height, boolean rounded) {
|
public static void drawChromaRectangle(int x, int y, int width, int height) {
|
||||||
int i = x;
|
int i = x;
|
||||||
while(true) {
|
while(true) {
|
||||||
if(i+10 <= width) {
|
if(i+10 <= width) {
|
||||||
drawRoundedRect(i, y, i+10, height, 4, RenderUtils.astolfoColorsDraw(i, GuiScreen.width,10000f), rounded);
|
Gui.drawRect(i, y, i+10, height,RenderUtils.astolfoColorsDraw(i, GuiScreen.width,10000f));
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -37,8 +37,7 @@ public class RenderUtils {
|
||||||
}
|
}
|
||||||
if(width-i != 0) {
|
if(width-i != 0) {
|
||||||
for(int h = i; h < width; h++) {
|
for(int h = i; h < width; h++) {
|
||||||
drawRoundedRect(h, y, h+1, height, 4, RenderUtils.astolfoColorsDraw(h, GuiScreen.width,10000f), rounded
|
Gui.drawRect(h, y, h+1, height,RenderUtils.astolfoColorsDraw(h, GuiScreen.width,10000f));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user