fix a small chathud issue

- delay chinese translations due to funky unicode stuff

Author: moehreag

CHANGELOG.md

@@ -43,4 +43,3 @@
 - fix some nasty bugs
 - re-add an option that had been removed in 2.2.2
 - update german translation
-- Added chinese (People's Republic of China (aka. Mainland China), Republic of China (aka. Taiwan)) translation

src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java

@@ -57,12 +57,12 @@ public class AxolotlClientConfig extends ConfigHolder {
     public final OptionCategory timeChanger = new OptionCategory("axolotlclient.timeChanger");
     public final OptionCategory searchFilters = new OptionCategory("searchFilters");
 
-    private final List<Option> options = new ArrayList<>();
+    private final List<Option<?>> options = new ArrayList<>();
     private final List<OptionCategory> categories = new ArrayList<>();
 
     public final List<OptionCategory> config = new ArrayList<>();
 
-    public void add(Option option){
+    public void add(Option<?> option){
         options.add(option);
     }
 
@@ -74,7 +74,7 @@ public List<OptionCategory> getCategories(){
         return categories;
     }
 
-    public List<Option> getOptions(){
+    public List<Option<?>> getOptions(){
         return options;
     }
 

src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ChatHud.java

@@ -157,7 +157,7 @@ public boolean tickable() {
     public void tick() {
         //setWidth((int) (client.options.chatWidth*320));
         int lastHeight = height;
-        setHeight(this.getHeight());//int) (client.options.chatHeightUnfocused*180)+11);
+        setHeight(getHeight(this.isChatFocused() ? this.client.options.chatHeightFocused : this.client.options.chatHeightUnfocused));//int) (client.options.chatHeightUnfocused*180)+11);
         if(lastHeight != getHeight()){
             onBoundsUpdate();
         }
@@ -206,9 +206,9 @@ public boolean isChatFocused() {
         return this.client.currentScreen instanceof ChatScreen;
     }
 
-    public int getHeight() {
+    /*public int getHeight() {
         return getHeight(this.isChatFocused() ? this.client.options.chatHeightFocused : this.client.options.chatHeightUnfocused);
-    }
+    }*/
 
     public static int getHeight(float chatHeight) {
         int i = 180;

src/main/java/io/github/axolotlclient/util/Util.java

@@ -203,6 +203,9 @@ public static <T> T make(T object, Consumer<T> initializer) {
     }
 
     public static boolean currentServerAddressContains(String address){
+        if(MinecraftClient.getInstance().isInSingleplayer() || MinecraftClient.getInstance().isIntegratedServerRunning()){
+            return false;
+        }
         if(MinecraftClient.getInstance().getCurrentServerEntry() != null){
             return MinecraftClient.getInstance().getCurrentServerEntry().address.contains(address);
         }
@@ -211,6 +214,10 @@ public static boolean currentServerAddressContains(String address){
     }
 
     public static String getCurrentServerAddress(){
+        if(MinecraftClient.getInstance().isInSingleplayer()){
+            return null;
+        }
+
         if(MinecraftClient.getInstance().getCurrentServerEntry() != null){
             return MinecraftClient.getInstance().getCurrentServerEntry().address;
         }