Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Commit

Permalink
1.19.3 update
Browse files Browse the repository at this point in the history
  • Loading branch information
DarkKronicle committed Dec 23, 2022
1 parent 051577b commit e7ae7e9
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 257 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/discord_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@ jobs:
if: |
!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.pull_request.title, '[ci skip]')
env:
discord_webhook: ${{ secrets.DISCORD_WEBHOOK }}
discord_webhook: ${{ secrets.DISCORD_WEBHOOK }}
action_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
- name: Capture build artifacts
uses: actions/upload-artifact@v2
with:
name: Artifacts
path: build/libs/
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
modrinth_token: ${{ secrets.MODRINTH_TOKEN }}
curseforge_token: ${{ secrets.CURSEFORGE_TOKEN }}
github_token: ${{ secrets.GH_API_KEY }}
discord_release_webhook: ${{ secrets.DISCORD_ANNOUNCEMENT_WEBHOOK }}
discord_release_webhook: ${{ secrets.DISCORD_WEBHOOK }}
- name: Capture build artifacts
uses: actions/upload-artifact@v2
with:
Expand Down
25 changes: 6 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish'
id "io.freefair.lombok" version "6.0.0-m2"
id "com.diffplug.spotless" version "5.17.1"
}

apply from: 'https://raw.githubusercontent.com/DarkKronicle/GradleScripts/main/gradle/publish.gradle'

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = "${project.minecraft_version}-${project.mod_version}"
Expand All @@ -22,6 +21,7 @@ if (file("extra.properties").exists()) {
repositories {
mavenCentral()
maven { url 'https://masa.dy.fi/maven' }
maven { url 'https://maven.terraformersmc.com/releases/' }
maven { url 'https://jitpack.io' }
}

Expand All @@ -30,8 +30,8 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.0:${project.malilib_version}"
modCompileOnly "io.github.prospector:modmenu:1.16.8"
modImplementation "fi.dy.masa.malilib:malilib-fabric-1.19.3:${project.malilib_version}"
modCompileOnly "com.terraformersmc:modmenu:5.0.1"

implementation "com.github.DarkKronicle.Konstruct:addons:${project.konstruct_version}"
implementation "com.github.DarkKronicle.Konstruct:core:${project.konstruct_version}"
Expand Down Expand Up @@ -89,19 +89,6 @@ assemble {
dependsOn 'downloadExtra'
}

spotless {
ratchetFrom 'origin/main'
format 'misc', {
// define the files to apply `misc` to
target '*.gradle', '*.md', '.gitignore'

// define the steps to apply to those files
trimTrailingWhitespace()
indentWithTabs() // or spaces. Takes an integer argument if you don't like 4
endWithNewline()
}
}

// configure the maven publication
publishing {
publications {
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
org.gradle.jvmargs=-Xmx1G

minecraft_version=1.19.2
yarn_mappings=1.19.1+build.1
loader_version=0.14.8
fabric_api_version=0.58.5+1.19.1
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.2
loader_version=0.14.11
fabric_api_version=0.68.1+1.19.3

mod_version=1.5.8
mod_version=1.5.9
maven_group=io.github.darkkronicle
archives_base_name=AdvancedChatCore

malilib_version=0.13.0
malilib_version=0.14.0
konstruct_version=2.0.3-build1
mxparser_version=4.4.2
owo_version=2.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,13 @@
import io.github.darkkronicle.advancedchatcore.util.StringInsert;
import io.github.darkkronicle.advancedchatcore.util.StringMatch;
import io.github.darkkronicle.advancedchatcore.util.TextUtil;
import java.util.*;

import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.BufferRenderer;
import net.minecraft.text.Text;

import java.util.*;

@Environment(EnvType.CLIENT)
public class InitHandler implements IInitializationHandler {

Expand Down Expand Up @@ -125,10 +124,10 @@ public void registerModHandlers() {
client.currentScreen.removed();
}
client.currentScreen = new AdvancedChatScreen(true);
BufferRenderer.unbindAll();
client.mouse.unlockCursor();
client.currentScreen.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
client.skipGameRender = false;;
client.updateWindowTitle();
return true;
});
InputHandler.getInstance().add("core_general", ConfigStorage.Hotkeys.TOGGLE_PERMANENT.config, (action, key) -> {
Expand Down
Loading

0 comments on commit e7ae7e9

Please sign in to comment.