Skip to content

Commit 2d8536d

Browse files
LangYa466LangYa466
committed
style: 修正GUI显示逻辑并优化颜色滑动条与模块列表的交互
1 parent f6b6b63 commit 2d8536d

File tree

10 files changed

+341
-160
lines changed

10 files changed

+341
-160
lines changed

‎src/main/java/cn/langya/module/impl/combat/KillAura.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@Setter
2929
public class KillAura extends Module {
3030
private final NumberValue maxCPSValue = new NumberValue("Max CPS", 6, 20, 1, 1); // 最大CPS设定
31-
private final NumberValue minCPSValue = new NumberValue("Min CPS", 6, maxCPSValue.getValue(), 1, 1); // 最小CPS设定
31+
private final NumberValue minCPSValue = new NumberValue("Min CPS", 6, 19, 1, 1); // 最小CPS设定
3232
private final ModeValue getCPSModeValue = new ModeValue("Get CPS Mode", "Random", "Increasing", "Decreasing", "Random"); // 获取CPS模式设定
3333
private final NumberValue scanRangeValue = new NumberValue("Scan Range", 4, 6, 1, 0.1F); // 寻找目标范围设定
3434
private final NumberValue attackRangeValue = new NumberValue("Attack Range", 3, scanRangeValue.getValue(), 1, 0.1F); // 攻击范围设定

‎src/main/java/cn/langya/module/impl/render/ClickGUI.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ public class ClickGUI extends Module {
1616
public ClickGUI() {
1717
super(Category.Render);
1818
setKeyCode(Keyboard.KEY_RSHIFT);
19+
20+
// anti gui-main-menu display👿
21+
setEnable(false);
1922
}
2023

2124
@Override

‎src/main/java/cn/langya/ui/clickgui/SimpleClickGUI.java

Lines changed: 321 additions & 145 deletions
Large diffs are not rendered by default.

‎src/main/java/cn/langya/utils/RenderUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,12 +104,12 @@ public static void drawColorSlider(int x, int y, int width, double value, double
104104
int barWidth = (int) (width * (value / max));
105105

106106
// 背景
107-
drawRect2(x, y, width, 5, new Color(50, 50, 50).getRGB());
107+
drawRect(x, y, width, 5, new Color(50, 50, 50).getRGB());
108108

109109
// 进度条
110-
drawRect2(x, y, barWidth, 5, color.getRGB());
110+
drawRect(x, y, barWidth, 5, color.getRGB());
111111

112112
// 滑块
113-
drawRect2(x + barWidth - 2, y - 2, 4, 9, Color.WHITE.getRGB());
113+
drawRect(x + barWidth - 2, y - 2, 4, 9, Color.WHITE.getRGB());
114114
}
115115
}

‎src/main/java/net/minecraft/client/Minecraft.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2917,7 +2917,7 @@ public static int getGLMaximumTextureSize()
29172917
{
29182918
for (int i = 16384; i > 0; i >>= 1)
29192919
{
2920-
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, null);
2920+
GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer) null);
29212921
int j = GL11.glGetTexLevelParameteri(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH);
29222922

29232923
if (j != 0)

‎src/main/java/net/minecraft/client/renderer/texture/TextureUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.awt.image.BufferedImage;
44
import java.io.IOException;
55
import java.io.InputStream;
6+
import java.nio.ByteBuffer;
67
import java.nio.IntBuffer;
78
import javax.imageio.ImageIO;
89
import net.minecraft.client.Minecraft;
@@ -176,7 +177,7 @@ public static void allocateTextureImpl(int p_180600_0_, int p_180600_1_, int p_1
176177

177178
for (int i = 0; i <= p_180600_1_; ++i)
178179
{
179-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, i, GL11.GL_RGBA, p_180600_2_ >> i, p_180600_3_ >> i, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
180+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, i, GL11.GL_RGBA, p_180600_2_ >> i, p_180600_3_ >> i, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
180181
}
181182
}
182183

‎src/main/java/net/minecraft/client/shader/Framebuffer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void createFramebuffer(int width, int height)
109109

110110
this.setFramebufferFilter(9728);
111111
GlStateManager.bindTexture(this.framebufferTexture);
112-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, this.framebufferTextureWidth, this.framebufferTextureHeight, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, null);
112+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, this.framebufferTextureWidth, this.framebufferTextureHeight, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer) null);
113113
OpenGlHelper.glBindFramebuffer(OpenGlHelper.GL_FRAMEBUFFER, this.framebufferObject);
114114
OpenGlHelper.glFramebufferTexture2D(OpenGlHelper.GL_FRAMEBUFFER, OpenGlHelper.GL_COLOR_ATTACHMENT0, 3553, this.framebufferTexture, 0);
115115

‎src/main/java/net/minecraft/util/IChatComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ else if (p_serialize_1_ instanceof ChatComponentTranslation)
218218
{
219219
if (object instanceof IChatComponent)
220220
{
221-
jsonarray1.add(this.serialize(object, object.getClass(), p_serialize_3_));
221+
jsonarray1.add(this.serialize((IChatComponent) object, object.getClass(), p_serialize_3_));
222222
}
223223
else
224224
{

‎src/main/java/net/optifine/Mipmaps.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net.optifine;
22

33
import java.awt.Dimension;
4+
import java.nio.ByteBuffer;
45
import java.nio.IntBuffer;
56
import java.util.ArrayList;
67
import java.util.List;
@@ -214,7 +215,7 @@ public static void allocateMipmapTextures(int width, int height, String name)
214215
int j = dimension.width;
215216
int k = dimension.height;
216217
int l = i + 1;
217-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, l, GL11.GL_RGBA, j, k, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
218+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, l, GL11.GL_RGBA, j, k, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
218219
}
219220
}
220221
}

‎src/main/java/net/optifine/shaders/Shaders.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3799,7 +3799,7 @@ private static void setupFrameBuffer()
37993799
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
38003800
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
38013801
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL14.GL_DEPTH_TEXTURE_MODE, GL11.GL_LUMINANCE);
3802-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_DEPTH_COMPONENT, renderWidth, renderHeight, 0, GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, null);
3802+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_DEPTH_COMPONENT, renderWidth, renderHeight, 0, GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, (ByteBuffer) null);
38033803
}
38043804

38053805
EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, dfbDepthTextures.get(0), 0);
@@ -3814,7 +3814,7 @@ private static void setupFrameBuffer()
38143814
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE);
38153815
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
38163816
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
3817-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, gbuffersFormat[k], renderWidth, renderHeight, 0, getPixelFormat(gbuffersFormat[k]), GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
3817+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, gbuffersFormat[k], renderWidth, renderHeight, 0, getPixelFormat(gbuffersFormat[k]), GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
38183818
EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + k, 3553, dfbColorTexturesFlip.getA(k), 0);
38193819
checkGLError("FT c");
38203820
}
@@ -3826,7 +3826,7 @@ private static void setupFrameBuffer()
38263826
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE);
38273827
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
38283828
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
3829-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, gbuffersFormat[l], renderWidth, renderHeight, 0, getPixelFormat(gbuffersFormat[l]), GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
3829+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, gbuffersFormat[l], renderWidth, renderHeight, 0, getPixelFormat(gbuffersFormat[l]), GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
38303830
checkGLError("FT ca");
38313831
}
38323832

@@ -3839,7 +3839,7 @@ private static void setupFrameBuffer()
38393839
for (int j = 0; j < usedColorBuffers; ++j)
38403840
{
38413841
GlStateManager.bindTexture(dfbColorTexturesFlip.getA(j));
3842-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, renderWidth, renderHeight, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
3842+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, renderWidth, renderHeight, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
38433843
EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + j, 3553, dfbColorTexturesFlip.getA(j), 0);
38443844
checkGLError("FT c");
38453845
}
@@ -3917,7 +3917,7 @@ private static void setupShadowFrameBuffer()
39173917
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL14.GL_TEXTURE_COMPARE_MODE, GL14.GL_COMPARE_R_TO_TEXTURE);
39183918
}
39193919

3920-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_DEPTH_COMPONENT, shadowMapWidth, shadowMapHeight, 0, GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, null);
3920+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_DEPTH_COMPONENT, shadowMapWidth, shadowMapHeight, 0, GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, (ByteBuffer) null);
39213921
}
39223922

39233923
EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36096, 3553, sfbDepthTextures.get(0), 0);
@@ -3931,7 +3931,7 @@ private static void setupShadowFrameBuffer()
39313931
int i1 = shadowColorFilterNearest[k] ? 9728 : 9729;
39323932
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, i1);
39333933
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, i1);
3934-
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, shadowMapWidth, shadowMapHeight, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, null);
3934+
GL11.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA, shadowMapWidth, shadowMapHeight, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, (ByteBuffer) null);
39353935
EXTFramebufferObject.glFramebufferTexture2DEXT(36160, 36064 + k, 3553, sfbColorTextures.get(k), 0);
39363936
checkGLError("FT sc");
39373937
}

0 commit comments

Comments
 (0)