run dev on cts 8 c

moehreag · moehreag · commit 19cad423e9a0 · 2022-07-26T08:42:15.000+02:00
diff --git a/.idea/runConfigurations/Minecraft_Client.xml b/.idea/runConfigurations/Minecraft_Client.xml
diff --git a/build.gradle b/build.gradle
@@ -9,6 +9,11 @@ version = project.version
 group = project.maven_group
 
 repositories {
+	maven {
+		name = 'CombatReforged'
+		url = 'https://maven.combatreforged.com/'
+	}
+
 	maven { url 'https://jitpack.io' }
 	maven {
 		url 'https://repo.hypixel.net/repository/Hypixel/'
diff --git a/gradle.properties b/gradle.properties
@@ -3,14 +3,14 @@ org.gradle.jvmargs = -Xmx1G
 org.gradle.parallel = true
 
 # Dependencies
-minecraft_version = 1.16.2
-yarn_mappings=1.16.2+build.47
-loader_version = 0.12.0
+minecraft_version = 1.16_combat-6
+yarn_mappings=1.16_combat-6+build.2
+loader_version = 0.14.8
 
 #Fabric api
 fabric_version=0.42.0+1.16
 
 # Mod Properties
-version = 2.1.3+1.16.2
+version = 2.1.5+1.16.2
 maven_group = io.github.axolotlclient
 archives_base_name = AxolotlClient
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 pluginManagement {
 	repositories {
 		maven {
-			name = 'Quilt'
-			url = 'https://maven.quiltmc.org/repository/release/'
+			name = 'CombatReforged'
+			url = 'https://maven.combatreforged.com/'
 		}
 		// Currently needed for Intermediary and other temporary dependencies
 		maven {
diff --git a/src/main/java/io/github/axolotlclient/config/screen/ButtonWidgetList.java b/src/main/java/io/github/axolotlclient/config/screen/ButtonWidgetList.java
@@ -127,7 +127,7 @@ public void render(MatrixStack matrixStack, int i, int j, float f) {
         int l = k + 6;
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferBuilder = tessellator.getBuffer();
-        this.client.getTextureManager().bindTexture(DrawableHelper.BACKGROUND_TEXTURE);
+        this.client.getTextureManager().bindTexture(DrawableHelper.OPTIONS_BACKGROUND_TEXTURE);
         RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
 
         int m = this.getRowLeft();
diff --git a/src/main/java/io/github/axolotlclient/mixin/MixinKeyboardInput.java b/src/main/java/io/github/axolotlclient/mixin/MixinKeyboardInput.java
@@ -18,10 +18,10 @@ public abstract class MixinKeyboardInput {
      * @param instance The sneak key
      * @return boolean whether the player should be sneaking or not
      */
-    /*@Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/options/KeyBinding;isPressed()Z", ordinal = 5))
+    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/options/KeyBinding;isPressed()Z", ordinal = 5))
     public boolean toggleSneak(KeyBinding instance){
         ToggleSprintHud hud = (ToggleSprintHud) HudManager.getINSTANCE().get(ToggleSprintHud.ID);
         return hud.isEnabled() && hud.sneakToggled.get() && MinecraftClient.getInstance().currentScreen==null ||
                 instance.isPressed();
-    }*/
+    }
 }
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java b/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java
@@ -116,13 +116,16 @@ public AbstractHudEntry get(Identifier identifier) {
     }
 
     public void render(MatrixStack matrices) {
+        client.getProfiler().push("Hud Modules");
         if (!(client.currentScreen instanceof HudEditScreen) && !client.options.debugEnabled) {
             for (AbstractHudEntry hud : getEntries()) {
                 if (hud.isEnabled()) {
+                    client.getProfiler().swap(hud.getName());
                     hud.renderHud(matrices);
                 }
             }
         }
+        client.getProfiler().pop();
     }
 
     public Optional<AbstractHudEntry> getEntryXY(int x, int y) {
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java
@@ -4,6 +4,7 @@
 import io.github.axolotlclient.config.options.BooleanOption;
 import io.github.axolotlclient.config.options.ColorOption;
 import io.github.axolotlclient.config.options.DoubleOption;
+import io.github.axolotlclient.config.options.EnumOption;
 import io.github.axolotlclient.config.options.OptionBase;
 import io.github.axolotlclient.config.options.OptionCategory;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
@@ -31,6 +32,7 @@ public abstract class AbstractHudEntry extends DrawUtil {
 
     protected BooleanOption enabled = new BooleanOption("enabled",false);
     public DoubleOption scale = new DoubleOption("scale", 1, 0.1F, 5);
+    protected EnumOption textAlignment = new EnumOption("textAlignment", new String[]{"center", "left", "right"}, "center");
     protected final ColorOption textColor = new ColorOption("textColor", Color.WHITE);
     protected final BooleanOption chroma = new BooleanOption("chroma", false);
     protected BooleanOption shadow = new BooleanOption("shadow",  getShadowDefault());
@@ -191,6 +193,20 @@ public void addConfigOptions(List<OptionBase<?>> options) {
         options.add(scale);
     }
 
+    protected void drawString(MatrixStack matrices, String s, int x, int y, Color color, boolean shadow){
+        switch (textAlignment.get()){
+            case "center":
+                drawCenteredString(matrices, MinecraftClient.getInstance().textRenderer, s, x+width/2, y, color.getAsInt());
+                break;
+            case "left":
+                DrawUtil.drawString(matrices, MinecraftClient.getInstance().textRenderer, s, x, y, color.getAsInt(), shadow);
+                break;
+            case "right":
+                DrawUtil.drawString(matrices, MinecraftClient.getInstance().textRenderer, s, x+width - MinecraftClient.getInstance().textRenderer.getWidth(s), y, color.getAsInt(), shadow);
+                break;
+        }
+    }
+
     public boolean isEnabled() {
         return enabled.get();
     }
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ActionBarHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ActionBarHud.java
@@ -48,33 +48,14 @@ public void render(MatrixStack matrices) {
 
 			matrices.push();
 			scale(matrices);
-			if (shadow.get()){
-				client.textRenderer.drawWithShadow(matrices, actionBar,
-					(float)getPos().x + Math.round((float) width /2) -  (float) client.textRenderer.getWidth(actionBar) /2,
-					(float)getPos().y + 3,
-					customTextColor.get() ? (textColor.get().getAlpha()==255 ?
-						new Color(
-							textColor.get().getRed(),
-							textColor.get().getGreen(),
-							textColor.get().getBlue(),
-							vanillaColor.getAlpha()).getAsInt():
-						textColor.get().getAsInt()) :
-						color
-				);
-			} else {
-
-				client.textRenderer.draw(matrices, actionBar,
-					(float)getPos().x + Math.round((float) width /2) - ((float) client.textRenderer.getWidth(actionBar) /2),
-					(float)getPos().y + 3,
-					customTextColor.get() ? (textColor.get().getAlpha()==255 ?
-						new Color(textColor.get().getRed(),
-							textColor.get().getGreen(),
-							textColor.get().getBlue(),
-							vanillaColor.getAlpha()).getAsInt():
-						textColor.get().getAsInt()) :
-						color
-				);
-			}
+            drawString(matrices, actionBar.asOrderedText().toString(), getPos().x, getPos().y + 3, customTextColor.get() ? (textColor.get().getAlpha()==255 ?
+                new Color(
+                    textColor.get().getRed(),
+                    textColor.get().getGreen(),
+                    textColor.get().getBlue(),
+                    vanillaColor.getAlpha()):
+                textColor.get()) :
+                vanillaColor, shadow.get());
 			matrices.pop();
 			ticksShown++;
 		} else {
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ArrowHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ArrowHud.java
@@ -72,7 +72,7 @@ public void tick() {
 			return;
 		}
 		if (!allArrowTypes.get()) {
-			currentArrow = client.player.getArrowType(Items.BOW.getStackForRender());
+			currentArrow = client.player.getArrowType(Items.BOW.getDefaultStack());
 		} else {
 			currentArrow = new ItemStack(Items.ARROW);
 		}
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/BossBarHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/BossBarHud.java
@@ -111,11 +111,8 @@ private void renderBossBar(MatrixStack matrices, int x, int y, BossBar bossBar)
 			Text text = bossBar.getName();
 			float textX = x + ((float) width / 2) - ((float) client.textRenderer.getWidth(text) / 2);
 			float textY = y - 9;
-			if (shadow.get()) {
-				client.textRenderer.drawWithShadow(matrices, text, textX, textY, textColor.get().getAsInt());
-			} else {
-				client.textRenderer.draw(matrices, text, textX, textY, textColor.get().getAsInt());
-			}
+
+            drawString(matrices, text.getString(), (int) textX, (int) textY, textColor.get(), shadow.get());
 		}
 	}
 
@@ -134,6 +131,7 @@ public void addConfigOptions(List<OptionBase<?>> options) {
         super.addConfigOptions(options);
         options.add(text);
         options.add(textColor);
+        options.add(textAlignment);
         options.add(shadow);
         options.add(bar);
         options.add(barColor);
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CleanHudEntry.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CleanHudEntry.java
@@ -1,5 +1,6 @@
 package io.github.axolotlclient.modules.hud.gui.hud;
 
+import io.github.axolotlclient.config.Color;
 import io.github.axolotlclient.config.options.OptionBase;
 import io.github.axolotlclient.modules.hud.gui.AbstractHudEntry;
 import io.github.axolotlclient.modules.hud.util.DrawPosition;
@@ -32,9 +33,9 @@ public void render(MatrixStack matrices) {
             fillRect(matrices, getBounds(), backgroundColor.get());
         }
         if(outline.get()) outlineRect(matrices, getBounds(), outlineColor.get());
-        drawCenteredString(matrices, client.textRenderer, getValue(),
-                new DrawPosition(pos.x + (Math.round(width) / 2),
-                pos.y + (Math.round((float) height / 2)) - 4),
+        drawString(matrices, getValue(),
+                pos.x,
+                pos.y + (Math.round((float) height / 2) - 4),
                 chroma.get()? textColor.getChroma() : textColor.get(),
                 shadow.get());
         matrices.pop();
@@ -45,9 +46,9 @@ public void renderPlaceholder(MatrixStack matrices) {
         renderPlaceholderBackground(matrices);
         scale(matrices);
         DrawPosition pos = getPos();
-        drawCenteredString(matrices, client.textRenderer, getPlaceholder(),
-                new DrawPosition(pos.x + (width / 2),
-                pos.y + (height / 2) - 4), -1, shadow.get());
+        drawString(matrices, getPlaceholder(),
+                pos.x,
+                pos.y + (height / 2) - 4, Color.WHITE, shadow.get());
         matrices.pop();
         hovered = false;
     }
@@ -56,6 +57,7 @@ public void renderPlaceholder(MatrixStack matrices) {
     public void addConfigOptions(List<OptionBase<?>> options) {
         super.addConfigOptions(options);
         options.add(textColor);
+        options.add(textAlignment);
         options.add(chroma);
         options.add(shadow);
         options.add(background);
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CoordsHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CoordsHud.java
@@ -126,26 +126,26 @@ public void render(MatrixStack matrices) {
 		int dir = getDirection(yaw);
 		String direction = getWordedDirection(dir);
 		TextRenderer textRenderer = client.textRenderer;
-		drawString(matrices, textRenderer, "X", pos.x + 1, pos.y + 2, firstColor.get().getAsInt(),
+		drawString(matrices, "X", pos.x + 1, pos.y + 2, firstColor.get(),
 			shadow.get());
-		drawString(matrices, textRenderer, String.valueOf(df.format(x)), pos.x + 11, pos.y + 2,
-			secondColor.get().getAsInt(), shadow.get());
+		drawString(matrices, String.valueOf(df.format(x)), pos.x + 11, pos.y + 2,
+			secondColor.get(), shadow.get());
 
-		drawString(matrices, textRenderer, "Y", pos.x + 1, pos.y + 12, firstColor.get().getAsInt(),
+		drawString(matrices, "Y", pos.x + 1, pos.y + 12, firstColor.get(),
 			shadow.get());
-		drawString(matrices, textRenderer, String.valueOf(df.format(y)), pos.x + 11, pos.y + 12,
-			secondColor.get().getAsInt(), shadow.get());
+		drawString(matrices, String.valueOf(df.format(y)), pos.x + 11, pos.y + 12,
+			secondColor.get(), shadow.get());
 
-		drawString(matrices, textRenderer, "Z", pos.x + 1, pos.y + 22, firstColor.get().getAsInt(),
+		drawString(matrices, "Z", pos.x + 1, pos.y + 22, firstColor.get(),
 			shadow.get());
-		drawString(matrices, textRenderer, String.valueOf(df.format(z)), pos.x + 11, pos.y + 22,
-			secondColor.get().getAsInt(), shadow.get());
+		drawString(matrices, String.valueOf(df.format(z)), pos.x + 11, pos.y + 22,
+			secondColor.get(), shadow.get());
 
-		drawString(matrices, textRenderer, direction, pos.x + 60, pos.y + 12,
-			firstColor.get().getAsInt(), shadow.get());
+		drawString(matrices, direction, pos.x + 60, pos.y + 12,
+			firstColor.get(), shadow.get());
 
-		drawString(matrices, textRenderer, getXDir(dir), pos.x + 60, pos.y + 2,
-			secondColor.get().getAsInt(), shadow.get());
+		drawString(matrices, getXDir(dir), pos.x + 60, pos.y + 2,
+			secondColor.get(), shadow.get());
 		textRenderer.drawWithShadow(matrices, getZDir(dir), pos.x + 60, pos.y + 22,
 			secondColor.get().getAsInt(), shadow.get());
 
@@ -232,6 +232,7 @@ public String getWordedDirection(int dir) {
     @Override
     public void addConfigOptions(List<OptionBase<?>> options) {
         super.addConfigOptions(options);
+        options.add(textAlignment);
         options.add(background);
         options.add(backgroundColor);
         options.add(outline);
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CrosshairHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/CrosshairHud.java
@@ -107,7 +107,7 @@ public void render(MatrixStack matrices) {
 				boolean targetingEntity = false;
 				if (this.client.targetedEntity != null && this.client.targetedEntity instanceof LivingEntity
 					&& progress >= 1.0F) {
-					targetingEntity = this.client.player.getAttackCooldownProgressPerTick() > 5.0F;
+					targetingEntity = this.client.player.method_31235() > 5.0F;
 					targetingEntity &= this.client.targetedEntity.isAlive();
 				}
 
@@ -125,7 +125,7 @@ public void render(MatrixStack matrices) {
 		}
 		if (!type.get().equalsIgnoreCase(CrosshairOption.TEXTURE.toString()) && this.client.options.attackIndicator == AttackIndicator.CROSSHAIR) {
 			float progress = this.client.player.getAttackCooldownProgress(0.0F);
-			if (progress != 1.0F) {
+			if (progress < 1.0F) {
 				fill(matrices.peek().getModel(), pos.x + (width / 2F) - 6, pos.y + (height / 2F) + 9, 11, 1,
 					attackIndicatorBackgroundColor.get().getAsInt());
 				fill(matrices.peek().getModel(), pos.x + (width / 2F) - 6, pos.y + (height / 2F) + 9,
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java
@@ -33,7 +33,7 @@ public PackDisplayHud() {
     public void init() {
         AxolotlClient.packs.forEach(pack -> {
             try {
-                if(!pack.getName().equalsIgnoreCase("Default") )//&& pack.getIcon()!=null)
+                if(!pack.getName().equalsIgnoreCase("Default") && !pack.getName().equalsIgnoreCase("Fabric Mods"))//&& pack.getIcon()!=null)
                     widgets.add(new packWidget(pack));
             } catch (Exception ignored) {
             }
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PotionsHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PotionsHud.java
@@ -67,7 +67,7 @@ public void render(MatrixStack matrices) {
 
                 drawTextWithShadow(matrices, client.textRenderer, text, pos.x + 20, pos.y + 4 + lastY, textColor.get().getAsInt());
 				drawString(matrices, client.textRenderer, StatusEffectUtil.durationToString(effect, 1),
-					pos.x + 20+4, pos.y + 6 + 10 + lastY, textColor.get().getAsInt(), shadow.get());
+					pos.x + 20+4, pos.y + 6 + 10 + lastY, 8355711, shadow.get());
 
 				lastY += 33;
 			}
diff --git a/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ReachDisplayHud.java b/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/ReachDisplayHud.java
@@ -4,7 +4,6 @@
 import io.github.axolotlclient.config.options.OptionBase;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.MathHelper;
 
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
diff --git a/src/main/resources/assets/axolotlclient/lang/en_us.json b/src/main/resources/assets/axolotlclient/lang/en_us.json
@@ -129,7 +129,7 @@
 	"entitycolor": "Color (Entities)",
 	"blockcolor": "Color (Container)",
 	"attackindicatorbg": "Attack Indicator (Background)",
-	"attackindicatorfb": "Attack Indicator (Foreground)",
+	"attackindicatorfg": "Attack Indicator (Foreground)",
 	"TEXTURE": "Texture",
 	"DIRECTION": "Direction",
 	"DOT": "Dot",
@@ -198,6 +198,7 @@
 	"outline": "Outline",
 	"outlineColor": "Outline Color",
 	"shadow": "Shadow",
+	"textAlignment": "Text Alignment",
 
 	"rpc": "Discord RPC",
 	"showActivity": "Show Activity",

Original file line number	Diff line number	Diff line change
`@@ -116,13 +116,16 @@ public AbstractHudEntry get(Identifier identifier) {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`public void render(MatrixStack matrices) {`
	`119`	`+ client.getProfiler().push("Hud Modules");`
`119`	`120`	`if (!(client.currentScreen instanceof HudEditScreen) && !client.options.debugEnabled) {`
`120`	`121`	`for (AbstractHudEntry hud : getEntries()) {`
`121`	`122`	`if (hud.isEnabled()) {`
	`123`	`+ client.getProfiler().swap(hud.getName());`
`122`	`124`	`hud.renderHud(matrices);`
`123`	`125`	`}`
`124`	`126`	`}`
`125`	`127`	`}`
	`128`	`+ client.getProfiler().pop();`
`126`	`129`	`}`
`127`	`130`
`128`	`131`	`public Optional<AbstractHudEntry> getEntryXY(int x, int y) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void tick() {`
`72`	`72`	`return;`
`73`	`73`	`}`
`74`	`74`	`if (!allArrowTypes.get()) {`
`75`		`- currentArrow = client.player.getArrowType(Items.BOW.getStackForRender());`
	`75`	`+ currentArrow = client.player.getArrowType(Items.BOW.getDefaultStack());`
`76`	`76`	`} else {`
`77`	`77`	`currentArrow = new ItemStack(Items.ARROW);`
`78`	`78`	`}`