Merge pull request #37 from AxolotlClient/1.8/kronhud-2.2.x

1.8/kronhud 2.2.x

Author: moehreag

CHANGELOG.md

@@ -0,0 +1,39 @@
+### 1.0.0 - 2.0.0
+
+- Create the mod
+- Learn Java
+- Add Badge System
+- Add HUD modules
+- Add Hypixel mods
+- Add DiscordRPC
+- Add Custom Skies
+- Add Zoom
+- Rewrite Configuration System
+
+- Add Turkish translation (YakisikliBaran)
+
+### 2.0.0 - 2.2.0
+
+- Separate the config system into a config library
+- Add French translation (CornetPanique86)
+- Add MotionBlur & Freelook (TheKodeToad)
+- Add Particle Modifiers
+- Add Screenshot Utils
+- Add Scrollable Tooltips
+- Add TnTTime
+- Add external Module Support
+- Add some other stuff I forgot
+- Full Changelog: https://github.com/AxolotlClient/AxolotlClient-mod/compare/v2.1.0+1.8.9...v2.2.0+1.8.9
+
+### 2.2.1
+
+- use own maven instead of JitPack
+- updated Translations
+- fix bugs in the config library
+
+### 2.2.2
+
+- Port of KronHUD 2.2.3's feature set
+- Use JSON format for translations
+- Various Fixes
+- now using the provided DefaultConfigManager

README.md

@@ -24,3 +24,9 @@ Features include:
 - Custom Block Outlines
 - Discord RPC
 - Badges for players using the mod
+
+### Contributing
+
+- feel free to join the discord to discuss new features
+- if you have a feature or a new/updated translation, feel free to open a pull request.
+- note your changes in CHANGELOG.md to be added to the next version's changelog.

build.gradle

@@ -2,8 +2,11 @@ plugins {
 	id 'fabric-loom' version "1.0-SNAPSHOT"
 	id 'io.github.juuxel.loom-quiltflower' version '1.7.+' // For loom 0.8-0.9, 0.11+
 	id 'maven-publish'
+	id 'com.modrinth.minotaur' version "2.+"
+	id 'io.freefair.lombok' version "6.5.1"
 }
 
+archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
@@ -20,7 +23,7 @@ repositories {
 	maven {
 		url "https://moehreag.duckdns.org/maven/releases"
 	}
-	
+	mavenLocal()
 	maven { url 'https://jitpack.io' }
 	mavenCentral()
 }
@@ -62,7 +65,7 @@ dependencies {
 	implementation('org.apache.logging.log4j:log4j-core:2.19.0')
 
 	modImplementation include("com.github.moehreag:search-in-resources:1.0.2")
-	modImplementation include('io.github.axolotlclient:AxolotlClient-config:1.0.8+1.8.9')
+	modImplementation include('io.github.axolotlclient:AxolotlClient-config:1.0.11+1.8.9')
 }
 
 // More hacks that make mac os work
@@ -136,3 +139,42 @@ publishing {
 		}
 	}
 }
+
+modrinth {
+	token = System.getenv("MODRINTH_TOKEN")
+	projectId = "p2rxzX0q"
+	versionNumber = "${project.version}"
+	versionType = "release"
+	uploadFile = remapJar
+	gameVersions = ["${project.minecraft_version}"]
+	loaders = ["fabric"]
+	dependencies {
+		//required.project "legacy-fabric-api" // Once lfapi is on modrinth (aka 'its next release')
+	}
+
+	// Changelog fetching: Credit LambdAurora.
+	// https://github.com/LambdAurora/LambDynamicLights/blob/1ef85f486084873b5d97b8a08df72f57859a3295/build.gradle#L145
+	// License: MIT
+	def changelogText = file('CHANGELOG.md').text
+	def regexVersion = ((String) project.version).split("\\+")[0].replaceAll('\\.', /\\./).replaceAll('\\+', '\\+')
+	def changelogRegex = ~"###? ${regexVersion}\\n\\n(( *- .+\\n)+)"
+	def matcher = changelogText =~ changelogRegex
+
+	if (matcher.find()) {
+		def changelogContent = matcher.group(1)
+
+		def changelogLines = changelogText.split('\n')
+		def linkRefRegex = ~'^\\[([A-z0-9 _\\-/+.]+)]: '
+		for (int i = changelogLines.length - 1; i > 0; i--) {
+			def line = changelogLines[i]
+			if ((line =~ linkRefRegex).find())
+				changelogContent += '\n' + line
+			else break
+		}
+		changelog = changelogContent
+	} else {
+		afterEvaluate {
+			tasks.modrinth.setEnabled(false)
+		}
+	}
+}

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version = 0.14.9
 
 # Mod Properties
-	mod_version = 2.2.1+1.8.9
+	mod_version = 2.2.2+1.8.9
 	maven_group = io.github.axolotlclient
 	archives_base_name = AxolotlClient
 

src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -1,11 +1,13 @@
 package io.github.axolotlclient;
 
 import com.mojang.blaze3d.platform.GlStateManager;
+import io.github.axolotlclient.AxolotlclientConfig.AxolotlClientConfigManager;
 import io.github.axolotlclient.AxolotlclientConfig.ConfigManager;
+import io.github.axolotlclient.AxolotlclientConfig.DefaultConfigManager;
 import io.github.axolotlclient.AxolotlclientConfig.options.BooleanOption;
+import io.github.axolotlclient.AxolotlclientConfig.options.Identifiable;
 import io.github.axolotlclient.AxolotlclientConfig.options.OptionCategory;
 import io.github.axolotlclient.config.AxolotlClientConfig;
-import io.github.axolotlclient.config.AxolotlClientConfigManager;
 import io.github.axolotlclient.modules.AbstractModule;
 import io.github.axolotlclient.modules.ModuleLoader;
 import io.github.axolotlclient.modules.freelook.Freelook;
@@ -67,7 +69,15 @@ public void onInitializeClient() {
         CONFIG.config.addAll(CONFIG.getCategories());
         CONFIG.config.add(config);
 
-        io.github.axolotlclient.AxolotlclientConfig.AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new AxolotlClientConfigManager());
+        AxolotlClientConfigManager.registerConfig(modid, CONFIG, configManager = new DefaultConfigManager(modid, FabricLoader.getInstance().getConfigDir().resolve("AxolotlClient.json"), CONFIG.config){
+            @Override
+            public String getName(Identifiable t) {
+                if(super.getName(t).startsWith("axolotlclient.")){
+                    return super.getName(t).substring(14);
+                }
+                return super.getName(t);
+            }
+        });
 
         modules.forEach(AbstractModule::lateInit);
 

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

@@ -0,0 +1,21 @@
+package io.github.axolotlclient.mixin;
+
+import io.github.axolotlclient.modules.hud.HudManager;
+import io.github.axolotlclient.modules.hud.gui.hud.simple.TPSHud;
+import net.minecraft.client.network.ClientPlayNetworkHandler;
+import net.minecraft.network.packet.s2c.play.WorldTimeUpdateS2CPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ClientPlayNetworkHandler.class)
+public abstract class ClientPlayNetworkHandlerMixin {
+
+    @Inject(method = "onWorldTimeUpdate", at = @At("HEAD"))
+    private void onWorldUpdate(WorldTimeUpdateS2CPacket packet, CallbackInfo ci) {
+        TPSHud tpsHud = (TPSHud) HudManager.getInstance().get(TPSHud.ID);
+        tpsHud.updateTime(packet.getTime());
+    }
+
+}

src/main/java/io/github/axolotlclient/mixin/ClientPlayNetworkHandlerMixin.java

@@ -26,6 +26,6 @@ public abstract class ClientPlayerEntityMixin {
     )
     private boolean alwaysPressed(KeyBinding sprintKey) {
         ToggleSprintHud hud = (ToggleSprintHud) HudManager.getInstance().get(ToggleSprintHud.ID);
-        return hud.sprintToggled.get() || sprintKey.isPressed();
+        return hud.getSprintToggled().get() || sprintKey.isPressed();
     }
 }

src/main/java/io/github/axolotlclient/mixin/ClientPlayerEntityMixin.java

@@ -1,29 +1,15 @@
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.hud.HudManager;
-import io.github.axolotlclient.modules.hud.gui.hud.CrosshairHud;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.ClientBrandRetriever;
 import net.minecraft.client.gui.hud.DebugHud;
-import net.minecraft.client.util.Window;
 import org.spongepowered.asm.mixin.Mixin;
 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(DebugHud.class)
 public abstract class DebugHudMixin {
 
-    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V"))
-    public void onRender(Window window, CallbackInfo ci){
-
-        CrosshairHud hud = (CrosshairHud) HudManager.getInstance().get(CrosshairHud.ID);
-        if(hud.isEnabled() && hud.showInF3.get()){
-            hud.render();
-        }
-    }
-
     @Redirect(method = "getLeftText", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/ClientBrandRetriever;getClientModName()Ljava/lang/String;"))
     public String nicerVersionString(){
         if(FabricLoader.getInstance().getModContainer("axolotlclient").isPresent()) {

src/main/java/io/github/axolotlclient/mixin/DebugHudMixin.java

@@ -0,0 +1,32 @@
+package io.github.axolotlclient.mixin;
+
+import io.github.axolotlclient.util.Hooks;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.math.MathHelper;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Entity.class)
+public abstract class EntityMixin {
+
+    @Shadow public float yaw;
+
+    @Shadow public float pitch;
+
+    @Inject(method = "increaseTransforms", at = @At("HEAD"))
+    private void updateLookDirection(float yaw, float pitch, CallbackInfo ci) {
+        if(yaw == 0 && pitch == 0) {
+            return;
+        }
+
+        float prevPitch = this.pitch;
+        float prevYaw = this.yaw;
+        pitch = (float)((double)prevPitch - (double)pitch * 0.15);
+        yaw = (float)((double)prevYaw + (double)yaw * 0.15);
+        pitch = MathHelper.clamp(pitch, -90.0F, 90.0F);
+        Hooks.PLAYER_DIRECTION_CHANGE.invoker().onChange(prevPitch, prevYaw, pitch, yaw);
+    }
+}