Overhauled EOTech Holographics

.github/workflows/code_quality.yml

@@ -2,19 +2,11 @@ name: Qodana
 
 on:
   workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - next
-      - release
 
 jobs:
   qodana:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      checks: write
+
     steps:
       - name: Qodana Composite
         uses: Red-Studio-Ragnarok/Qodana-Composite@main

.gitignore

@@ -21,11 +21,25 @@ build
 # Forge
 run
 
-# Windows
-desktop.ini
+# Dependencies
+node_modules
+
+# Production
+build
 
-# macOS
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
 .DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
-# other
-*.log
+desktop.ini

Changelog.md

@@ -62,19 +62,21 @@ like knowing which weapon is better or whether an attachment will be useful to y
 - Updated the url in the mod menu
 - Updated dependencies:
   - Requires Red Core 0.6 and up
-  - Requires MixinBooter 9.4 and up
+  - Requires MixinBooter 8.8 and up
 - Updated Korean translation
 - Reworked weapons tooltips
 - Reworked magazines tooltips
 - Reworked vests tooltips
 - Updated Chinese translation
 - Reworked how reloading works in creative so that it aligns with vanilla behavior
+- Overhauled the textures and models of:
+  - EOTech 512 A65 Holographic (Black)
+  - EOTech EXPS3-0 Holographic (Tan)
 
 ### Fixed
 
 - Fixed the default craftingmappings.json
 - Fixed the position of the RPG-7 and M202 projectiles
-- Fixed compatiblity with GroovyScript 1.2+
 
 ### Removed
 
@@ -92,18 +94,14 @@ like knowing which weapon is better or whether an attachment will be useful to y
 - Set a minimum Gradle Daemon JVM version requirement
 - Updated the `gradle.properties` to the new Red Studio standard one
 - Cleaned up the buildscript
-- Updated [GroovyScript](https://www.curseforge.com/minecraft/mc-mods/groovyscript) dependency to 1.2
-- Updated to [gradle-buildconfig-plugin](https://github.com/gmazzo/gradle-buildconfig-plugin) 5.5.0
+- Updated [GroovyScript](https://www.curseforge.com/minecraft/mc-mods/groovyscript) dependency to 1.1.2
+- Updated to [gradle-buildconfig-plugin](https://github.com/gmazzo/gradle-buildconfig-plugin) 5.4.0
+- Updated to [RetroFuturaGradle](https://github.com/GTNewHorizons/RetroFuturaGradle) 1.4.0
 - Switched to the new standard `gradle.properties`
 - General cleanup
 - Updated to [io.freefair.lombok](https://plugins.gradle.org/plugin/io.freefair.lombok) 8.7.1
 - Remade the build script
 - Switched from [RetroFuturaGradle](https://github.com/GTNewHorizons/RetroFuturaGradle) tags to [gradle-buildconfig-plugin](https://github.com/gmazzo/gradle-buildconfig-plugin)
-- Updated [MixinBooter](https://www.curseforge.com/minecraft/mc-mods/mixin-booter) dependency to 9.4
-- Updated to [org.jetbrains.gradle.plugin.idea-ext](https://github.com/JetBrains/gradle-idea-ext-plugin) 1.1.9
-- Props now use Red Core `AABBUtil`
-- Updated [Red Core](https://www.curseforge.com/minecraft/mc-mods/red-core) dependency to 0.6-Dev-8
-- Lombokified most of the codebase
 
 ## Modern Warfare Cubed Version 0.1.8 Changelog - 2024-08-16
 

build.gradle.kts

@@ -5,21 +5,21 @@ import org.jetbrains.gradle.ext.Gradle
 
 plugins {
     id("com.gtnewhorizons.retrofuturagradle") version "1.4.1"
-    id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.9"
-    id("com.github.gmazzo.buildconfig") version "5.5.0"
+    id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.8"
+    id("com.github.gmazzo.buildconfig") version "5.4.0"
     id("io.freefair.lombok") version "8.7.1"
 }
 
 group = "com.paneedah"
-version = "0.2-Dev-3" // Versioning must follow Ragnarök versioning convention: https://github.com/Red-Studio-Ragnarok/Commons/blob/main/Ragnar%C3%B6k%20Versioning%20Convention.md
+version = "0.2-Dev-2" // Versioning must follow Ragnarök versioning convention: https://github.com/Red-Studio-Ragnarok/Commons/blob/main/Ragnar%C3%B6k%20Versioning%20Convention.md
 
 val id = "mwc"
 val plugin = "${project.group}.${id}.asm.MWCPlugin"
 
-val redCoreVersion = "MC-1.8-1.12-" + "0.6-Dev-8"
+val redCoreVersion = "MC-1.8-1.12-" + "0.6-Dev-7"
 
-val groovyScriptVersion = "1.2.0-hotfix1"
-val mixinBooterVersion = "9.4"
+val groovyScriptVersion = "1.1.2"
+val mixinBooterVersion = "8.8"
 
 minecraft {
     mcVersion = "1.12.2"
@@ -57,7 +57,7 @@ dependencies {
     implementation("dev.redstudio", "Red-Core", redCoreVersion)
 
     compileOnly(rfg.deobf("curse.maven:techguns-244201:2958103"))
-    compileOnly("com.cleanroommc", "groovyscript", groovyScriptVersion) {
+    compileOnly("com.cleanroommc:groovyscript:1.1.2") {
         isTransitive = false
     }
 
@@ -80,9 +80,9 @@ buildConfig {
     documentation.set("This class defines constants for ${project.name}.\n<p>\nThey are automatically updated by Gradle.")
 
     useJavaOutput()
-    buildConfigField("ID", id)
-    buildConfigField("NAME", project.name)
-    buildConfigField("VERSION", project.version.toString())
+    buildConfigField("String", "ID", provider { """"$id"""" })
+    buildConfigField("String", "NAME", provider { """"${project.name}"""" })
+    buildConfigField("String", "VERSION", provider { """"${project.version}"""" })
     buildConfigField("org.apache.logging.log4j.Logger", "LOGGER", "org.apache.logging.log4j.LogManager.getLogger(NAME)")
     buildConfigField("dev.redstudio.redcore.logging.RedLogger", "RED_LOGGER", """new RedLogger(NAME, "https://linkify.cz/MWCBugReport", LOGGER)""")
 }
@@ -113,7 +113,7 @@ tasks {
         inputs.properties(expandProperties)
 
         filesMatching("**/*.*") {
-            val exclusions = listOf(".png", "_at.cfg", ".refmap.json", ".obj", ".frag", ".ogg", "craftingmappings.json")
+            val exclusions = listOf(".png", ".obj", ".frag", ".ogg", "craftingmappings.json")
             if (!exclusions.any { path.endsWith(it) })
                 expand(expandProperties)
         }