refactoring
/
SLC-1.8.9
mirror of https://github.com/refactorinqq/SLC-1.8.9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #75 from Silent-Client/TEST2 

Test2
This commit is contained in:
kirillsaint 2023-11-01 02:28:01 +06:00 committed by GitHub
parent 556e0b4acd 381620b7ca
commit 1af186fadf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 111049 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/silentclient/client/Client.java
View File

@ -30,6 +30,7 @@ import net.silentclient.client.mods.SettingsManager;
import net.silentclient.client.mods.settings.FPSBoostMod;
import net.silentclient.client.mods.settings.GeneralMod;
import net.silentclient.client.mods.util.PingSource;
import net.silentclient.client.mods.util.Server;
import net.silentclient.client.mods.util.Utils;
import net.silentclient.client.premium.PremiumCosmeticsGui;
import net.silentclient.client.premium.PremiumUtils;
@ -512,6 +513,8 @@ public class Client {
this.updateUserInformation();
Client.logger.info("Update Connection Server: " + event.getServerData().serverIP);
silentSocket.getSocket().emit("update_information", event.getServerData().serverIP);
Server.setHypixel(Server.checkIsHypixel());
Server.setRuHypixel(Server.checkIsRuHypixel());
}
@EventTarget
@ -522,6 +525,8 @@ public class Client {
this.updateUserInformation();
Client.logger.info("Update Connection Server: null");
silentSocket.getSocket().emit("update_information", "");
Server.setHypixel(Server.checkIsHypixel());
Server.setRuHypixel(Server.checkIsRuHypixel());
}
@EventTarget
@ -532,6 +537,8 @@ public class Client {
this.updateUserInformation();
Client.logger.info("Update Connection Server: null");
silentSocket.getSocket().emit("update_information", "");
Server.setHypixel(Server.checkIsHypixel());
Server.setRuHypixel(Server.checkIsRuHypixel());
}
// Instances

11
src/main/java/net/silentclient/client/cosmetics/AnimatedResourceLocation.java
View File

@ -2,6 +2,7 @@ package net.silentclient.client.cosmetics;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.silentclient.client.mixin.ducks.TextureManagerExt;
import net.silentclient.client.utils.TimerUtils;
import java.util.ArrayList;
@ -66,12 +67,12 @@ public class AnimatedResourceLocation {
}
public void bindTexture() {
// if(currentFrame == 0) {
// binding = false;
if(currentFrame == 0) {
binding = false;
Minecraft.getMinecraft().getTextureManager().bindTexture(this.getTexture());
// return;
// }
// binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000);
return;
}
binding = ((TextureManagerExt) Minecraft.getMinecraft().getTextureManager()).waitBindTexture(new StaticResourceLocation(this.getTexture().getResourcePath()), new StaticResourceLocation(this.getTextures()[0].getResourcePath()), 1000);
}
public void setCurrentFrame(int currentFrame) {

1
src/main/java/net/silentclient/client/cosmetics/HatRenderer.java
View File

@ -167,6 +167,7 @@ public class HatRenderer extends ModelBase implements LayerRenderer<AbstractClie
switch(model) {
case "halo":
case "halo2":
case "sharp_halo":
translations = new Vector3f(0.65f, 0.65f, 0.65f);
scale = 0.08f;
break;

14
src/main/java/net/silentclient/client/mixin/mixins/GuiInGameMixin.java
View File

@ -12,9 +12,9 @@ import net.silentclient.client.Client;
import net.silentclient.client.event.impl.EventRenderDamageTint;
import net.silentclient.client.event.impl.RenderEvent;
import net.silentclient.client.gui.lite.clickgui.utils.GlUtils;
import net.silentclient.client.gui.notification.NotificationManager;
import net.silentclient.client.mods.hud.BossBarMod;
import net.silentclient.client.mods.hud.ScoreboardMod;
import net.silentclient.client.mods.render.AnimationsMod;
import net.silentclient.client.mods.render.CrosshairMod;
import net.silentclient.client.mods.render.PackTweaksMod;
import net.silentclient.client.mods.render.TitlesMod;
@ -25,13 +25,23 @@ import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.*;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GuiIngame.class)
public abstract class GuiInGameMixin extends Gui {
@Shadow @Final private Minecraft mc;
@Redirect(method = "renderPlayerStats", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiIngame;drawTexturedModalRect(IIIIII)V", ordinal = 4))
public void oldHealth(GuiIngame instance, int i1, int i2, int i3, int i4, int i5, int i6) {
if(!Client.getInstance().getModInstances().getOldAnimationsMod().isEnabled() || !Client.getInstance().getSettingsManager().getSettingByClass(AnimationsMod.class, "1.7 Health Animation").getValBoolean()) {
instance.drawTexturedModalRect(i1, i2, i3, i4, i5, i6);
}
}
@Inject(method = "renderGameOverlay", at = @At("RETURN"))
public void renderEvent(float partialTicks, CallbackInfo ci) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);

4
src/main/java/net/silentclient/client/mods/HudMod.java
View File

@ -54,7 +54,7 @@ public class HudMod extends ModDraggable {
boolean brackets = Client.getInstance().getSettingsManager().getSettingByName(this, "Brackets").getValBoolean();
if(background) {
return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 58 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 1 : 57);
return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 64 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 64);
}
return font.getStringWidth((brackets ? "[" : "") + getTextForRender() + (brackets ? "]" : ""));
@ -70,7 +70,7 @@ public class HudMod extends ModDraggable {
boolean brackets = Client.getInstance().getSettingsManager().getSettingByName(this, "Brackets").getValBoolean();
if(background) {
return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 58 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 58);
return (font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) > 64 ? font.getStringWidth((brackets ? "[" : "") + getText() + (brackets ? "]" : "")) + 2 : 64);
}
return font.getStringWidth((brackets ? "[" : "") + getTextForRender() + (brackets ? "]" : ""));

2
src/main/java/net/silentclient/client/mods/ModDraggable.java
View File

@ -43,7 +43,7 @@ public abstract class ModDraggable extends Mod implements IRenderer {
@Override
public void setup() {
this.addSliderSetting("Scale", this, 3.0F, 1.0F, 5.0F, false);
this.addSliderSetting("Scale", this, 2.0F, 1.0F, 5.0F, false);
super.setup();
}

2
src/main/java/net/silentclient/client/mods/hud/KeystrokesMod.java
View File

@ -28,7 +28,7 @@ public class KeystrokesMod extends ModDraggable {
@Override
public void setup() {
super.setup();
this.addSliderSetting("Scale", this, 2.23F, 1.0F, 5.0F, false);
setUpdated(true);
ArrayList<String> cpsModes = new ArrayList<>();
cpsModes.add("None");

25
src/main/java/net/silentclient/client/mods/hypixel/AutoGGMod.java
View File

@ -1,13 +1,5 @@
package net.silentclient.client.mods.hypixel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
import net.minecraft.network.play.server.S02PacketChat;
import net.silentclient.client.Client;
import net.silentclient.client.event.EventTarget;
@ -16,6 +8,14 @@ import net.silentclient.client.mods.Mod;
import net.silentclient.client.mods.ModCategory;
import net.silentclient.client.mods.util.Server;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
public class AutoGGMod extends Mod {
private static boolean isHypixel;
@ -58,15 +58,6 @@ public class AutoGGMod extends Mod {
return;
}
if(Server.isSilent()) {
String formattedMessage = e.getChatComponent().getFormattedText();
if(formattedMessage.contains("§r§6Winner:")) {
AutoGGMod.isRunning = true;
AutoGGMod.THREAD_POOL.submit(new sendGG());
}
return;
}
if(AutoGGMod.isHypixel) {
try {
String unformattedMessage = e.getChatComponent().getUnformattedText();

1
src/main/java/net/silentclient/client/mods/render/AnimationsMod.java
View File

@ -16,6 +16,7 @@ public class AnimationsMod extends Mod {
this.addBooleanSetting("1.7 Block Animation", this, true);
this.addBooleanSetting("1.7 Rod Position", this, true);
this.addBooleanSetting("1.7 Punching Animation", this, true);
this.addBooleanSetting("1.7 Health Animation", this, true);
this.addBooleanSetting("1.7 Eating & Drinking Animation", this, true);
this.addBooleanSetting("1.7 Block-Hitting Animation", this, true);
this.addBooleanSetting("1.7 Item Switching Animation", this, true);

39
src/main/java/net/silentclient/client/mods/util/Server.java
View File

@ -2,11 +2,29 @@ package net.silentclient.client.mods.util;
import net.minecraft.client.Minecraft;
import java.net.URL;
import java.util.regex.Pattern;
public class Server {
public static boolean hypixel = false;
public static boolean ruHypixel = false;
public static boolean isHypixel() {
return hypixel;
}
public static void setHypixel(boolean hypixel) {
Server.hypixel = hypixel;
}
public static boolean isRuHypixel() {
return ruHypixel;
}
public static void setRuHypixel(boolean ruHypixel) {
Server.ruHypixel = ruHypixel;
}
public static boolean checkIsHypixel() {
if(Minecraft.getMinecraft().isSingleplayer()) {
return false;
}
@ -21,24 +39,7 @@ public class Server {
}
}
public static boolean isSilent() {
if(Minecraft.getMinecraft().isSingleplayer()) {
return false;
}
try {
String serverIp = Minecraft.getMinecraft().getCurrentServerData().serverIP.toString();
if(!serverIp.startsWith("http") && !serverIp.startsWith("https")){
serverIp = "http://" + serverIp;
}
URL serverUrl = new URL(serverIp);
return (serverUrl.getHost().toString().toLowerCase().equals("mc.silentclient.net") || serverUrl.getHost().toString().equals("practice.silentclient.net"));
} catch (Exception err) {
return false;
}
}
public static boolean isRuHypixel() {
public static boolean checkIsRuHypixel() {
if(Minecraft.getMinecraft().isSingleplayer()) {
return false;
}

110990
src/main/resources/assets/minecraft/silentclient/models/sharp_halo.obj Normal file
View File

File diff suppressed because it is too large Load Diff