Merge pull request #16 from Silent-Client/TEST2

Test2
This commit is contained in:
kirillsaint 2023-08-04 22:46:19 +06:00 committed by GitHub
commit 949b93d114
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 7 deletions

View File

@ -1,7 +1,9 @@
package net.silentclient.client.keybinds;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.settings.KeyBinding;
import net.silentclient.client.mixin.SilentClientTweaker;
import org.apache.commons.lang3.ArrayUtils;
import org.lwjgl.input.Keyboard;
@ -13,6 +15,14 @@ public class KeyBindManager {
public KeyBinding ZOOM = new KeyBinding("Silent Client - Zoom", Keyboard.KEY_C, "Silent Client");
public KeyBindManager(GameSettings gameSettings) {
if(SilentClientTweaker.hasOptifine) {
try {
this.unregisterKeybind(gameSettings, (KeyBinding) GameSettings.class.getField("ofKeyBindZoom").get(Minecraft.getMinecraft().gameSettings));
} catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
e.printStackTrace();
}
}
this.registerKeyBind(gameSettings, CLICKGUI);
this.registerKeyBind(gameSettings, PERSPECTIVE);
this.registerKeyBind(gameSettings, ZOOM);

View File

@ -12,7 +12,7 @@ import org.lwjgl.input.Keyboard;
public class ZoomMod extends Mod {
public ZoomMod() {
super("Zoom", ModCategory.MODS, "silentclient/icons/mods/customzoom.png");
super("Zoom", ModCategory.MODS, "silentclient/icons/mods/customzoom.png", true);
}
private SimpleAnimation zoomAnimation = new SimpleAnimation(0.0F);

View File

@ -57,6 +57,9 @@ public class PlayerResponse extends AbstractReply {
public int claimed_premium_cosmetics;
public FavoriteCosmetics favorite_cosmetics;
public int is_senior_tester;
public int is_senior_tech_support;
public int is_tech_support;
public int is_jr_admin;
public int is_tester_manager;
public BigInteger discord_id;
@ -206,7 +209,7 @@ public class PlayerResponse extends AbstractReply {
}
public boolean isStaff() {
return is_staff == 1 || isAdmin() || isDev() || isTester() || isManager() || isSeniorTester() || isTesterManager();
return is_staff == 1 || isAdmin() || isDev() || isTester() || isManager() || isSeniorTester() || isTesterManager() || is_senior_tech_support == 1 || is_tech_support == 1;
}
public boolean isSeniorTester() {
@ -222,7 +225,7 @@ public class PlayerResponse extends AbstractReply {
}
public boolean isAdmin() {
return is_admin == 1;
return is_admin == 1 || is_jr_admin == 1;
}
public boolean isDev() {

View File

@ -36,7 +36,7 @@ MOD:Auto Tip:false
MOD:Level Head:false
MOD:Nick Hider:false
MOD:Time Changer:false
MOD:Zoom:false
MOD:Zoom:true
MOD:Combo Counter:false
POS:Combo Counter:0.0:0.0
MOD:Hit Color:false

View File

@ -36,7 +36,7 @@ MOD:Auto Tip:false
MOD:Level Head:false
MOD:Nick Hider:false
MOD:Time Changer:false
MOD:Zoom:false
MOD:Zoom:true
MOD:Combo Counter:false
POS:Combo Counter:0.0:0.0
MOD:Hit Color:false

View File

@ -36,7 +36,7 @@ MOD:Auto Tip:false
MOD:Level Head:false
MOD:Nick Hider:false
MOD:Time Changer:false
MOD:Zoom:false
MOD:Zoom:true
MOD:Combo Counter:false
POS:Combo Counter:0.0:0.0
MOD:Hit Color:false

View File

@ -36,7 +36,7 @@ MOD:Auto Tip:false
MOD:Level Head:false
MOD:Nick Hider:false
MOD:Time Changer:false
MOD:Zoom:false
MOD:Zoom:true
MOD:Combo Counter:false
POS:Combo Counter:0.0:0.0
MOD:Hit Color:false