fixed the keybinds triggering when they are un binded (#9 )

* fix keybind triggering when un binded * translation had wrong key * it's in the same class
[ci skip] Migrate github actions to GTNH-Actions-Workflows
2026-11-15 17:44:46 +00:00 · 2022-09-14 07:32:45 +02:00 · 2022-07-16 10:52:02 -07:00 · 2022-06-05 23:19:30 +02:00 · 2022-02-14 22:11:52 +01:00
10 changed files with 276 additions and 355 deletions
@@ -1,9 +0,0 @@
-directory="run/crash-reports"
-if [ -d $directory ]; then
-  echo "Crash reports detected:"
-  cat $directory/*
-  exit 1
-else
-  echo "No crash reports detected"
-  exit 0
-fi
@@ -1,5 +1,3 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

 name: Build and test

@@ -11,35 +9,5 @@ on:

 jobs:
  build-and-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-      with: 
-        fetch-depth: 0
-    
-    - name: Set up JDK 8
-      uses: actions/setup-java@v2
-      with:
-        java-version: '8'
-        distribution: 'adopt'
-        cache: gradle
-        
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-
-    - name: Setup the workspace
-      run: ./gradlew setupCIWorkspace
-    
-    - name: Build the mod
-      run: ./gradlew build
-
-    - name: Run server for 1 minute
-      run: |
-        mkdir run
-        echo "eula=true" > run/eula.txt  
-        timeout 10 ./gradlew runServer || true
-
-    - name: Test no crashes happend
-      run: |
-        chmod +x .github/scripts/test-no-crash-reports.sh
-        .github/scripts/test-no-crash-reports.sh
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit
@@ -1,51 +1,14 @@
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle

 name: Release tagged build

 on:
  push:
-    tags:
-      - '*'
+    tags: [ '*' ]
+
+permissions:
+  contents: write

 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set release version
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
-      - name: Set up JDK 8
-        uses: actions/setup-java@v2
-        with:
-          java-version: '8'
-          distribution: 'adopt'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - name: Setup the workspace
-        run: ./gradlew setupCIWorkspace
-
-      - name: Build the mod
-        run: ./gradlew build
-
-      - name: Release under current tag
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
-          prerelease: false
-          title: "${{ env.RELEASE_VERSION }}"
-          files: build/libs/*.jar
-
-      - name: Publish to Maven
-        run: ./gradlew publish
-        env:
-          MAVEN_USER: ${{ secrets.MAVEN_USER }}
-          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit
@@ -1,4 +1,4 @@
-Attribution-ShareAlike 4.0 International
+Attribution-NonCommercial-ShareAlike 4.0 International

 =======================================================================

@@ -54,18 +54,18 @@ exhaustive, and do not form part of our licenses.

 =======================================================================

-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
+Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
+Public License

 By exercising the Licensed Rights (defined below), You accept and agree
 to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
+Attribution-NonCommercial-ShareAlike 4.0 International Public License
+("Public License"). To the extent this Public License may be
+interpreted as a contract, You are granted the Licensed Rights in
+consideration of Your acceptance of these terms and conditions, and the
+Licensor grants You such rights in consideration of benefits the
+Licensor receives from making the Licensed Material available under
+these terms and conditions.


 Section 1 -- Definitions.
@@ -84,7 +84,7 @@ Section 1 -- Definitions.
     and Similar Rights in Your contributions to Adapted Material in
     accordance with the terms and conditions of this Public License.

-  c. BY-SA Compatible License means a license listed at
+  c. BY-NC-SA Compatible License means a license listed at
     creativecommons.org/compatiblelicenses, approved by Creative
     Commons as essentially the equivalent of this Public License.

@@ -108,7 +108,7 @@ Section 1 -- Definitions.

  g. License Elements means the license attributes listed in the name
     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution and ShareAlike.
+     Public License are Attribution, NonCommercial, and ShareAlike.

  h. Licensed Material means the artistic or literary work, database,
     or other material to which the Licensor applied this Public
@@ -122,7 +122,15 @@ Section 1 -- Definitions.
  j. Licensor means the individual(s) or entity(ies) granting rights
     under this Public License.

-  k. Share means to provide material to the public by any means or
+  k. NonCommercial means not primarily intended for or directed towards
+     commercial advantage or monetary compensation. For purposes of
+     this Public License, the exchange of the Licensed Material for
+     other material subject to Copyright and Similar Rights by digital
+     file-sharing or similar means is NonCommercial provided there is
+     no payment of monetary compensation in connection with the
+     exchange.
+
+  l. Share means to provide material to the public by any means or
     process that requires permission under the Licensed Rights, such
     as reproduction, public display, public performance, distribution,
     dissemination, communication, or importation, and to make material
@@ -130,13 +138,13 @@ Section 1 -- Definitions.
     public may access the material from a place and at a time
     individually chosen by them.

-  l. Sui Generis Database Rights means rights other than copyright
+  m. Sui Generis Database Rights means rights other than copyright
     resulting from Directive 96/9/EC of the European Parliament and of
     the Council of 11 March 1996 on the legal protection of databases,
     as amended and/or succeeded, as well as other essentially
     equivalent rights anywhere in the world.

-  m. You means the individual or entity exercising the Licensed Rights
+  n. You means the individual or entity exercising the Licensed Rights
     under this Public License. Your has a corresponding meaning.


@@ -150,9 +158,10 @@ Section 2 -- Scope.
          exercise the Licensed Rights in the Licensed Material to:

            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
+               in part, for NonCommercial purposes only; and

-            b. produce, reproduce, and Share Adapted Material.
+            b. produce, reproduce, and Share Adapted Material for
+               NonCommercial purposes only.

       2. Exceptions and Limitations. For the avoidance of doubt, where
          Exceptions and Limitations apply to Your use, this Public
@@ -220,7 +229,9 @@ Section 2 -- Scope.
          Rights, whether directly or through a collecting society
          under any voluntary or waivable statutory or compulsory
          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
+          reserves any right to collect such royalties, including when
+          the Licensed Material is used other than for NonCommercial
+          purposes.


 Section 3 -- License Conditions.
@@ -265,7 +276,6 @@ following conditions.
          reasonable to satisfy the conditions by providing a URI or
          hyperlink to a resource that includes the required
          information.
-
       3. If requested by the Licensor, You must remove any of the
          information required by Section 3(a)(1)(A) to the extent
          reasonably practicable.
@@ -277,7 +287,7 @@ following conditions.

       1. The Adapter's License You apply must be a Creative Commons
          license with the same License Elements, this version or
-          later, or a BY-SA Compatible License.
+          later, or a BY-NC-SA Compatible License.

       2. You must include the text of, or the URI or hyperlink to, the
          Adapter's License You apply. You may satisfy this condition
@@ -297,14 +307,15 @@ apply to Your use of the Licensed Material:

  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
+     portion of the contents of the database for NonCommercial purposes
+     only;

  b. if You include all or a substantial portion of the database
     contents in a database in which You have Sui Generis Database
     Rights, then the database in which You have Sui Generis Database
     Rights (but not its individual contents) is Adapted Material,
-
     including for purposes of Section 3(b); and
+
  c. You must comply with the conditions in Section 3(a) if You Share
     all or a substantial portion of the contents of the database.

@@ -404,7 +415,6 @@ Section 8 -- Interpretation.
     that apply to the Licensor or You, including from the legal
     processes of any jurisdiction or authority.

-
 =======================================================================

 Creative Commons is not a party to its public
@@ -1,4 +1,4 @@
-//version: 1644349045
+//version: 1652851397
 /*
 DO NOT CHANGE THIS FILE!

@@ -9,26 +9,28 @@ Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.g

 import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+import org.gradle.internal.logging.text.StyledTextOutputFactory

 import java.util.concurrent.TimeUnit

 buildscript {
    repositories {
        maven {
-            name = "forge"
-            url = "https://maven.minecraftforge.net"
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
        }
        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
        }
        maven {
-            name = "Scala CI dependencies"
-            url = "https://repo1.maven.org/maven2/"
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
        }
        maven {
-            name = "jitpack"
-            url = "https://jitpack.io"
+            name 'jitpack'
+            url 'https://jitpack.io'
        }
    }
    dependencies {
@@ -37,21 +39,27 @@ buildscript {
 }

 plugins {
+    id 'java-library'
    id 'idea'
    id 'eclipse'
    id 'scala'
    id 'maven-publish'
-    id('org.jetbrains.kotlin.jvm') version ('1.6.10') apply false
-    id('org.ajoberstar.grgit') version('4.1.1')
-    id('com.github.johnrengelman.shadow') version('4.0.4')
-    id('com.palantir.git-version') version('0.13.0') apply false
-    id('de.undercouch.download') version('5.0.1')
+    id 'org.jetbrains.kotlin.jvm'        version '1.5.30'       apply false
+    id 'org.jetbrains.kotlin.kapt'       version '1.5.30'       apply false
+    id 'com.google.devtools.ksp'         version '1.5.30-1.0.0' apply false
+    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'com.palantir.git-version'        version '0.13.0'       apply false
+    id 'de.undercouch.download'          version '5.0.1'
+    id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
 }

 if (project.file('.git/HEAD').isFile()) {
    apply plugin: 'com.palantir.git-version'
 }

+def out = services.get(StyledTextOutputFactory).create('an-output')
+
 apply plugin: 'forge'

 def projectJavaVersion = JavaLanguageVersion.of(8)
@@ -96,6 +104,7 @@ checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")

 boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()

 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
@@ -167,8 +176,8 @@ configurations.all {
 try {
    'git config core.fileMode false'.execute()
 }
-catch (Exception e) {
-    logger.error("\u001B[31mgit isn't installed at all\u001B[0m")
+catch (Exception ignored) {
+    out.style(Style.Failure).println("git isn't installed at all")
 }

 // Pulls version first from the VERSION env and then git tag
@@ -177,19 +186,22 @@ String versionOverride = System.getenv("VERSION") ?: null
 try {
    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
 }
-catch (Exception e) {
-    logger.error("\n\u001B[1;31mThis mod must be version controlled by Git AND the repository must provide at least one tag,\n" +
-                 "or the VERSION override must be set! \u001B[32m(Don't download from GitHub using the ZIP option, instead\n" +
-                 "clone the repository, see\u001B[33m https://gtnh.miraheze.org/wiki/Development \u001B[32mfor details.)\u001B[0m\n");
+catch (Exception ignored) {
+    out.style(Style.Failure).text(
+        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+    )
    versionOverride = 'NO-GIT-TAG-SET'
    identifiedVersion = versionOverride
 }
 version = minecraftVersion + '-' + identifiedVersion
-String modVersion = identifiedVersion
+ext {
+    modVersion = identifiedVersion
+}

-if( identifiedVersion.equals(versionOverride) ) {
-    logger.error('\u001B[31m\u001B[7mWe hope you know what you\'re doing using\u001B[0m\u001B[1;34m ' + modVersion + '\u001B[0m\n');
-    logger.error('\7\u001B[31mGoing to blindly try to use\u001B[1;34m ' + modVersion + '\u001B[0m\u001B[31m, this probably won\'t work the way you expect!!\u001B[0m\n');
+if(identifiedVersion == versionOverride) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
 }

 group = modGroup
@@ -200,22 +212,25 @@ else {
    archivesBaseName = modId
 }

-
 def arguments = []
 def jvmArguments = []

-if(usesMixins.toBoolean()) {
+if (usesMixins.toBoolean()) {
    arguments += [
-            "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
-    ]
-    jvmArguments += [
-            "-Dmixin.debug.countInjections=true", "-Dmixin.debug.verbose=true", "-Dmixin.debug.export=true"
+        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
    ]
+    if (usesMixinDebug.toBoolean()) {
+        jvmArguments += [
+            "-Dmixin.debug.countInjections=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true"
+        ]
+    }
 }

 minecraft {
-    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
-    runDir = "run"
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'

    if (replaceGradleTokenInFile) {
        replaceIn replaceGradleTokenInFile
@@ -248,8 +263,8 @@ minecraft {
    }
 }

-if(file("addon.gradle").exists()) {
-    apply from: "addon.gradle"
+if(file('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
 }

 apply from: 'repositories.gradle'
@@ -262,58 +277,63 @@ configurations {

 repositories {
    maven {
-        name = "Overmind forge repo mirror"
-        url = "https://gregtech.overminddl1.com/"
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
    }
    if(usesMixins.toBoolean()) {
        maven {
-            name = "sponge"
-            url = "https://repo.spongepowered.org/repository/maven-public"
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
        }
        maven {
-            url = "https://jitpack.io"
+            url 'https://jitpack.io'
        }
    }
 }

 dependencies {
    if(usesMixins.toBoolean()) {
-        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
-        annotationProcessor("com.google.guava:guava:24.1.1-jre")
-        annotationProcessor("com.google.code.gson:gson:2.8.6")
-        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
+        annotationProcessor('com.google.guava:guava:24.1.1-jre')
+        annotationProcessor('com.google.code.gson:gson:2.8.6')
+        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
        // using 0.8 to workaround a issue in 0.7 which fails mixin application
-        compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
+        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
            // Mixin includes a lot of dependencies that are too up-to-date
-            exclude module: "launchwrapper"
-            exclude module: "guava"
-            exclude module: "gson"
-            exclude module: "commons-io"
-            exclude module: "log4j-core"
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
        }
-        compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
    }
 }

 apply from: 'dependencies.gradle'

-def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
 def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
 def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"

 task generateAssets {
-    if(usesMixins.toBoolean()) {
-        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+    if (usesMixins.toBoolean()) {
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        if (!mixinConfigFile.exists()) {
+            mixinConfigFile.text = """{
  "required": true,
  "minVersion": "0.7.11",
  "package": "${modGroup}.${mixinsPackage}",
  "plugin": "${modGroup}.${mixinPlugin}",
  "refmap": "${mixingConfigRefMap}",
  "target": "@env(DEFAULT)",
-  "compatibilityLevel": "JAVA_8"
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [],
+  "server": []
 }
-
 """
+        }
    }
 }

@@ -401,12 +421,11 @@ tasks.withType(JavaExec).configureEach {
    )
 }

-processResources
-{
+processResources {
    // this will ensure that this task is redone when the versions change.
    inputs.property "version", project.version
    inputs.property "mcversion", project.minecraft.version
-    
+
    // replace stuff in mcmod.info, nothing else
    from(sourceSets.main.resources.srcDirs) {
        include 'mcmod.info'
@@ -430,7 +449,7 @@ processResources

 def getManifestAttributes() {
    def manifestAttributes = [:]
-    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
    }

@@ -446,14 +465,14 @@ def getManifestAttributes() {
        manifestAttributes += [
                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
        ]
    }
    return manifestAttributes
 }

 task sourcesJar(type: Jar) {
-    from (sourceSets.main.allJava)
+    from (sourceSets.main.allSource)
    from (file("$projectDir/LICENSE"))
    getArchiveClassifier().set('sources')
 }
@@ -508,7 +527,7 @@ task devJar(type: Jar) {
 }

 task apiJar(type: Jar) {
-    from (sourceSets.main.allJava) {
+    from (sourceSets.main.allSource) {
        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
    }

@@ -533,12 +552,15 @@ artifacts {
    }
 }

-// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID), 
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
 // and isn't strictly needed with the POM so just disable it.
 tasks.withType(GenerateModuleMetadata) {
    enabled = false
 }

+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
+
 publishing {
    publications {
        maven(MavenPublication) {
@@ -547,7 +569,7 @@ publishing {
                artifact source: shadowJar, classifier: ""
            }
            if(!noPublishedSources) {
-                artifact source: sourcesJar, classifier: "src"
+                artifact source: sourcesJar, classifier: "sources"
            }
            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
            if (apiPackage) {
@@ -558,17 +580,21 @@ publishing {
            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
            // Using the identified version, not project.version as it has the prepended 1.7.10
            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
-            
-            // remove extra garbage from who knows where
+
+            // remove extra garbage from minecraft and minecraftDeps configuration
            pom.withXml {
-                def badPomGroup = ['net.minecraft', 'com.google.code.findbugs', 'org.ow2.asm', 'com.typesafe.akka', 'com.typesafe', 'org.scala-lang',
-                                   'org.scala-lang.plugins', 'net.sf.jopt-simple', 'lzma', 'com.mojang', 'org.apache.commons', 'org.apache.httpcomponents',
-                                   'commons-logging', 'java3d', 'net.sf.trove4j', 'com.ibm.icu', 'com.paulscode', 'io.netty', 'com.google.guava', 
-                                   'commons-io', 'commons-codec', 'net.java.jinput', 'net.java.jutils', 'com.google.code.gson', 'org.apache.logging.log4j', 
-                                   'org.lwjgl.lwjgl', 'tv.twitch', '']
+                def badArtifacts = [:].withDefault {[] as Set<String>}
+                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                    for (dependency in configuration.allDependencies) {
+                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+                    }
+                }
+                // example for specifying extra stuff to ignore
+                // badArtifacts["org.example.group"] += "artifactName"
+
                Node pomNode = asNode()
                pomNode.dependencies.'*'.findAll() {
-                    badPomGroup.contains(it.groupId.text()) 
+                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
                }.each() {
                    it.parent().remove(it)
                }
@@ -600,7 +626,7 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
    if (autoUpdateBuildScript.toBoolean()) {
        performBuildScriptUpdate(projectDir.toString())
    } else {
-        println("Build script update available! Run 'gradle updateBuildScript'")
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
    }
 }

@@ -612,7 +638,7 @@ boolean performBuildScriptUpdate(String projectDir) {
    if (isNewBuildScriptVersionAvailable(projectDir)) {
        def buildscriptFile = getFile("build.gradle")
        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
-        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
        return true
    }
    return false
@@ -681,7 +707,7 @@ def deobf(String sourceURL, String fileName) {
    String bon2File  = bon2Dir + "/BON2-2.5.0.jar"
    String obfFile = cacheDir + "modules-2/files-2.1/" + fileName + ".jar"
    String deobfFile = cacheDir + "modules-2/files-2.1/" + fileName + "-deobf.jar"
-    
+
    if(file(deobfFile).exists()) {
        return files(deobfFile)
    }
@@ -712,7 +738,7 @@ def deobf(String sourceURL, String fileName) {
 // Helper methods

 def checkPropertyExists(String propertyName) {
-    if (project.hasProperty(propertyName) == false) {
+    if (!project.hasProperty(propertyName)) {
        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
    }
 }
@@ -1,94 +1,63 @@
 package mcp.mobius.waila.client;

-import java.util.List;
-
-import org.lwjgl.input.Keyboard;
-
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent;
 import mcp.mobius.waila.api.impl.ConfigHandler;
-import mcp.mobius.waila.cbcore.LangUtil;
 import mcp.mobius.waila.gui.screens.config.ScreenConfig;
-import mcp.mobius.waila.overlay.RayTracing;
 import mcp.mobius.waila.utils.Constants;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.common.config.Configuration;
+import org.lwjgl.input.Keyboard;

 public class KeyEvent {
+
 	public static KeyBinding key_cfg;
 	public static KeyBinding key_show;
 	public static KeyBinding key_liquid;
 	public static KeyBinding key_recipe;
 	public static KeyBinding key_usage;
-	
+
+	public KeyEvent() {
+		ClientRegistry.registerKeyBinding(key_cfg = new KeyBinding(Constants.BIND_WAILA_CFG, Keyboard.KEY_NUMPAD0, "Waila"));
+		ClientRegistry.registerKeyBinding(key_show = new KeyBinding(Constants.BIND_WAILA_SHOW, Keyboard.KEY_NUMPAD1, "Waila"));
+		ClientRegistry.registerKeyBinding(key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID, Keyboard.KEY_NUMPAD2, "Waila"));
+		ClientRegistry.registerKeyBinding(key_recipe = new KeyBinding(Constants.BIND_WAILA_RECIPE, Keyboard.KEY_NUMPAD3, "Waila"));
+		ClientRegistry.registerKeyBinding(key_usage = new KeyBinding(Constants.BIND_WAILA_USAGE, Keyboard.KEY_NUMPAD4, "Waila"));
+	}
+
 	@SubscribeEvent
-	public void onKeyEvent(KeyInputEvent event){
-		int key      = Keyboard.getEventKey();
-		Minecraft mc = Minecraft.getMinecraft();
-
-		if (Keyboard.getEventKeyState()){		
-			if (key == key_cfg.getKeyCode()){
-				if(mc.currentScreen == null)
-					mc.displayGuiScreen(new ScreenConfig(mc.currentScreen));			
+	public void onKeyEvent(KeyInputEvent event) {
+		if (key_cfg.isPressed()) {
+			Minecraft mc = Minecraft.getMinecraft();
+			if (mc.currentScreen == null) {
+				mc.displayGuiScreen(new ScreenConfig(null));
 			}
-	
-			else if (key == key_show.getKeyCode() && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){
-				boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
-				ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, !status);
-			}
-			
-			else if (key == key_show.getKeyCode() && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)){
-				ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
-			}
-			
-			else if (key == key_liquid.getKeyCode()){
-				boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true);
-				ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status);
-			}	
-			
-			else if (key == key_recipe.getKeyCode()){
-				if (Loader.isModLoaded("NotEnoughItems")){
-					try{
-						Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, true);
-					} catch (Exception e){}				
+		} else if (key_show.isPressed() && ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) {
+			boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
+			ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, !status);
+		} else if (key_show.isPressed() && !ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_MODE, false)) {
+			ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOW, true);
+		} else if (key_liquid.isPressed()) {
+			boolean status = ConfigHandler.instance().getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true);
+			ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status);
+		} else if (key_recipe.isPressed()) {
+			if (Loader.isModLoaded("NotEnoughItems")) {
+				try {
+					Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, true);
+				} catch (Exception ignored) {
 				}
 			}
-			
-			else if (key == key_usage.getKeyCode()){
-				if (Loader.isModLoaded("NotEnoughItems")){
-					try{
-						Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, false);
-					} catch (Exception e){}
+		} else if (key_usage.isPressed()) {
+			if (Loader.isModLoaded("NotEnoughItems")) {
+				try {
+					Class.forName("mcp.mobius.waila.handlers.nei.NEIHandler").getDeclaredMethod("openRecipeGUI", boolean.class).invoke(null, false);
+				} catch (Exception ignored) {
 				}
-			}			
-		} 
+			}
+		}
 	}
-	
-	public KeyEvent(){
-		KeyEvent.key_cfg    = new KeyBinding(Constants.BIND_WAILA_CFG,     Keyboard.KEY_NUMPAD0, "Waila");
-		KeyEvent.key_show   = new KeyBinding(Constants.BIND_WAILA_SHOW,    Keyboard.KEY_NUMPAD1, "Waila");
-		KeyEvent.key_liquid = new KeyBinding(Constants.BIND_WAILA_LIQUID,  Keyboard.KEY_NUMPAD2, "Waila");		
-		KeyEvent.key_recipe = new KeyBinding(Constants.BIND_WAILA_RECIPE,  Keyboard.KEY_NUMPAD3, "Waila");
-		KeyEvent.key_usage  = new KeyBinding(Constants.BIND_WAILA_USAGE,   Keyboard.KEY_NUMPAD4, "Waila");
-		
-		ClientRegistry.registerKeyBinding(KeyEvent.key_cfg);
-		ClientRegistry.registerKeyBinding(KeyEvent.key_show);
-		ClientRegistry.registerKeyBinding(KeyEvent.key_liquid);
-		ClientRegistry.registerKeyBinding(KeyEvent.key_recipe);
-		ClientRegistry.registerKeyBinding(KeyEvent.key_usage);

-		/*
-        Minecraft.getMinecraft().gameSettings.keyBindings = (KeyBinding[])ArrayUtils.addAll(
-        		new KeyBinding[] {KeyHandler.key_cfg,  KeyHandler.key_show, KeyHandler.key_liquid}, 
-        		Minecraft.getMinecraft().gameSettings.keyBindings);
-        */        
-	}
 }
@@ -37,7 +37,6 @@ public class Message0x00ServerPing extends SimpleChannelInboundHandler<Message0x
 	@Override
 	public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, IWailaMessage rawmsg) {
 		try{
-			Message0x00ServerPing msg = (Message0x00ServerPing)rawmsg;
 			int nkeys = dat.readShort();
 			for (int i = 0; i < nkeys; i++){
 				this.forcedKeys.put(WailaPacketHandler.INSTANCE.readString(dat), dat.readBoolean());
@@ -91,67 +91,66 @@ public class Message0x01TERequest extends SimpleChannelInboundHandler<Message0x0
 		}		
 	}

-	@Override
+	@SuppressWarnings("rawtypes")
+    @Override
 	protected void channelRead0(ChannelHandlerContext ctx, Message0x01TERequest msg) throws Exception {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-        World           world  = DimensionManager.getWorld(msg.dim);
-        TileEntity      entity = world.getTileEntity(msg.posX, msg.posY, msg.posZ);
-        Block           block  = world.getBlock(msg.posX, msg.posY, msg.posZ);
-        
-        if (entity != null){
-        	try{
-        		NBTTagCompound tag  = new NBTTagCompound();
-        		boolean hasNBTBlock = ModuleRegistrar.instance().hasNBTProviders(block);
-        		boolean hasNBTEnt   = ModuleRegistrar.instance().hasNBTProviders(entity);
+        World world  = DimensionManager.getWorld(msg.dim);
+        if(world == null) return;
+        TileEntity entity = world.getTileEntity(msg.posX, msg.posY, msg.posZ);
+        Block block  = world.getBlock(msg.posX, msg.posY, msg.posZ);
+        if(entity == null) return;
+        try{
+            NBTTagCompound tag  = new NBTTagCompound();
+            boolean hasNBTBlock = ModuleRegistrar.instance().hasNBTProviders(block);
+            boolean hasNBTEnt   = ModuleRegistrar.instance().hasNBTProviders(entity);

-        		if (hasNBTBlock || hasNBTEnt){
-        			tag.setInteger("x", msg.posX);
-            		tag.setInteger("y", msg.posY);
-            		tag.setInteger("z", msg.posZ);
-            		tag.setString ("id", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
-            		
-            		EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
-            		
-            		for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(block).values()){
-	        			for (IWailaDataProvider provider : providersList){
-	        				try{
-	        					tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
-	        				} catch (AbstractMethodError ame){
-	        					tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
-	        				} catch (NoSuchMethodError nsm){
-	        					tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);        					
-	        				}
-	        			}
-            		}
-        			
-            		
-            		for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(entity).values()){
-	        			for (IWailaDataProvider provider : providersList){
-	        				try{        				
-	        					tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
-	        				} catch (AbstractMethodError ame){
-	        					tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
-	        				} catch (NoSuchMethodError nsm){
-	        					tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);        					
-	        				}
-	        			}
-            		}
-        			
-        		} else {
-        			entity.writeToNBT(tag);
-        			tag = NBTUtil.createTag(tag, msg.keys);
-        		}
-        		
-    			tag.setInteger("WailaX", msg.posX);
-        		tag.setInteger("WailaY", msg.posY);
-        		tag.setInteger("WailaZ", msg.posZ);
-        		tag.setString ("WailaID", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
+            if (hasNBTBlock || hasNBTEnt){
+                tag.setInteger("x", msg.posX);
+                tag.setInteger("y", msg.posY);
+                tag.setInteger("z", msg.posZ);
+                tag.setString ("id", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));
+                
+                EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
+                
+                for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(block).values()){
+                    for (IWailaDataProvider provider : providersList){
+                        try{
+                            tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
+                        } catch (AbstractMethodError ame){
+                            tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
+                        } catch (NoSuchMethodError nsm){
+                            tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);                          
+                        }
+                    }
+                }
+                
+                
+                for (List<IWailaDataProvider> providersList : ModuleRegistrar.instance().getNBTProviders(entity).values()){
+                    for (IWailaDataProvider provider : providersList){
+                        try{                        
+                            tag = provider.getNBTData(player, entity, tag, world, msg.posX, msg.posY, msg.posZ);
+                        } catch (AbstractMethodError ame){
+                            tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);
+                        } catch (NoSuchMethodError nsm){
+                            tag = AccessHelper.getNBTData(provider, entity, tag, world, msg.posX, msg.posY, msg.posZ);                          
+                        }
+                    }
+                }
+                
+            } else {
+                entity.writeToNBT(tag);
+                tag = NBTUtil.createTag(tag, msg.keys);
+            }
+            
+            tag.setInteger("WailaX", msg.posX);
+            tag.setInteger("WailaY", msg.posY);
+            tag.setInteger("WailaZ", msg.posZ);
+            tag.setString ("WailaID", (String)((HashMap)classToNameMap.get(null)).get(entity.getClass()));

-        		WailaPacketHandler.INSTANCE.sendTo(new Message0x02TENBTData(tag), WailaPacketHandler.getPlayer(ctx));
-                //ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-        	}catch(Throwable e){
-        		WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
-        	}
+            WailaPacketHandler.INSTANCE.sendTo(new Message0x02TENBTData(tag), WailaPacketHandler.getPlayer(ctx));
+            //ctx.writeAndFlush(new Message0x02TENBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+        }catch(Throwable e){
+            WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
        }
 		
 		
@@ -1,6 +1,8 @@
 package mcp.mobius.waila.network;

-import cpw.mods.fml.common.FMLCommonHandler;
+import java.util.HashSet;
+import java.util.List;
+
 import cpw.mods.fml.common.network.NetworkRegistry;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -14,13 +16,9 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetHandlerPlayServer;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;

-import java.util.HashSet;
-import java.util.List;
-
 public class Message0x03EntRequest extends SimpleChannelInboundHandler<Message0x03EntRequest> implements IWailaMessage {

 	public int dim;
@@ -65,39 +63,37 @@ public class Message0x03EntRequest extends SimpleChannelInboundHandler<Message0x

 	@Override
 	protected void channelRead0(ChannelHandlerContext ctx, Message0x03EntRequest msg) throws Exception {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
-        World           world  = DimensionManager.getWorld(msg.dim);
-        Entity          entity = world.getEntityByID(msg.id);
-        
-        if (entity != null){
-        	try{
-        		NBTTagCompound tag = new NBTTagCompound();
-        		
-        		EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
-        		
-        		if (ModuleRegistrar.instance().hasNBTEntityProviders(entity)){
-        			for (List<IWailaEntityProvider> providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity).values()){
-	        			for (IWailaEntityProvider provider : providersList){
-	        				try{
-	        					tag = provider.getNBTData(player, entity, tag, world);
-	        				} catch (AbstractMethodError ame){
-	        					tag = AccessHelper.getNBTData(provider, entity, tag);
-	        				}        				
-	        			}
-        			}
+        World world  = DimensionManager.getWorld(msg.dim);
+        if(world == null) return;
+        Entity entity = world.getEntityByID(msg.id);
+        if(entity == null) return;
+        try{
+            NBTTagCompound tag = new NBTTagCompound();
+            
+            EntityPlayerMP player = ((NetHandlerPlayServer) ctx.channel().attr(NetworkRegistry.NET_HANDLER).get()).playerEntity;
+            
+            if (ModuleRegistrar.instance().hasNBTEntityProviders(entity)){
+                for (List<IWailaEntityProvider> providersList : ModuleRegistrar.instance().getNBTEntityProviders(entity).values()){
+                    for (IWailaEntityProvider provider : providersList){
+                        try{
+                            tag = provider.getNBTData(player, entity, tag, world);
+                        } catch (AbstractMethodError ame){
+                            tag = AccessHelper.getNBTData(provider, entity, tag);
+                        }                       
+                    }
+                }

-        		} else {
-            		entity.writeToNBT(tag);
-            		tag = NBTUtil.createTag(tag, msg.keys);
-        		}
-        		
-        		tag.setInteger("WailaEntityID", entity.getEntityId());
+            } else {
+                entity.writeToNBT(tag);
+                tag = NBTUtil.createTag(tag, msg.keys);
+            }
+            
+            tag.setInteger("WailaEntityID", entity.getEntityId());

-        		WailaPacketHandler.INSTANCE.sendTo(new Message0x04EntNBTData(tag), WailaPacketHandler.getPlayer(ctx));
-        		//ctx.writeAndFlush(new Message0x04EntNBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
-        	}catch(Throwable e){
-        		WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
-        	}
+            WailaPacketHandler.INSTANCE.sendTo(new Message0x04EntNBTData(tag), WailaPacketHandler.getPlayer(ctx));
+            //ctx.writeAndFlush(new Message0x04EntNBTData(tag)).addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE);
+        }catch(Throwable e){
+            WailaExceptionHandler.handleErr(e, entity.getClass().toString(), null);
        }		
 	}

@@ -26,12 +26,12 @@ enchant.title.maxlvl=Max lvl
 enchant.title.weight=Gewicht
 enchant.label.enchantability=Enchantbaarheid

-keybind.configscreen=[Waila] Configuratiescherm
-keybind.showhide=[Waila] Toon/Verberg
-keybind.showliquid=[Waila] Toon vloeistoffen
-keybind.showrecipe=[Waila] Toon recepten
-keybind.showusage=[Waila] Toon gebruik
-keybind.testing=[Waila] Testen
+waila.keybind.wailaconfig=[Waila] Configuratiescherm
+waila.keybind.wailadisplay=[Waila] Toon/Verberg
+waila.keybind.liquid=[Waila] Toon vloeistoffen
+waila.keybind.recipe=[Waila] Toon recepten
+waila.keybind.usage=[Waila] Toon gebruik
+waila.keybind.testing=[Waila] Testen

 client.msg.norecipe=Geen recept gevonden.
 client.msg.nousage=Geen gebruik gevonden.
@@ -57,7 +57,7 @@ hud.msg.frequency=Frequentie
 hud.msg.owner=Eigenaar
 hud.msg.public=Publiek
 hud.msg.restricted=Begrensd
-hud.msg.private=Privé
+hud.msg.private=Priv�

 hud.msg.white=Wit
 hud.msg.orange=Oranje
Author	SHA1	Message	Date
Alexdoru	80cfdfd41e	fixed the keybinds triggering when they are un binded (#9 ) * fix keybind triggering when un binded * translation had wrong key * it's in the same class	2022-09-14 07:32:45 +02:00
Jason Mitchell	08a9f33dbb	[ci skip] Migrate github actions to GTNH-Actions-Workflows	2022-07-16 10:52:02 -07:00
glowredman	8023588d71	Moar Null Safety (#8 ) * Update build.gradle * Check for world == null	2022-06-05 23:19:30 +02:00
bombcar	6ca097d5d0	BY-NC-SA 4.0 (#7 )	2022-02-14 22:11:52 +01:00