Skip to content

Commit

Permalink
Revert "Overhauled EOTech Holographics (#482)"
Browse files Browse the repository at this point in the history
This reverts commit 1b2dce2.
  • Loading branch information
Desoroxxx committed Nov 11, 2024
1 parent 1b2dce2 commit 8d51b86
Show file tree
Hide file tree
Showing 86 changed files with 2,357 additions and 3,111 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@ 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
Expand Down
24 changes: 5 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,11 @@ build
# Forge
run

# Dependencies
node_modules

# Production
build

# Generated files
.docusaurus
.cache-loader
# Windows
desktop.ini

# Misc
# macOS
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

desktop.ini
# other
*.log
16 changes: 9 additions & 7 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,19 @@ 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 8.8 and up
- Requires MixinBooter 9.4 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

Expand All @@ -94,14 +92,18 @@ 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.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
- 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
- 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

Expand Down
22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.8"
id("com.github.gmazzo.buildconfig") version "5.4.0"
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.9"
id("com.github.gmazzo.buildconfig") version "5.5.0"
id("io.freefair.lombok") version "8.7.1"
}

group = "com.paneedah"
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
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

val id = "mwc"
val plugin = "${project.group}.${id}.asm.MWCPlugin"

val redCoreVersion = "MC-1.8-1.12-" + "0.6-Dev-7"
val redCoreVersion = "MC-1.8-1.12-" + "0.6-Dev-8"

val groovyScriptVersion = "1.1.2"
val mixinBooterVersion = "8.8"
val groovyScriptVersion = "1.2.0-hotfix1"
val mixinBooterVersion = "9.4"

minecraft {
mcVersion = "1.12.2"
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies {
implementation("dev.redstudio", "Red-Core", redCoreVersion)

compileOnly(rfg.deobf("curse.maven:techguns-244201:2958103"))
compileOnly("com.cleanroommc:groovyscript:1.1.2") {
compileOnly("com.cleanroommc", "groovyscript", groovyScriptVersion) {
isTransitive = false
}

Expand All @@ -80,9 +80,9 @@ buildConfig {
documentation.set("This class defines constants for ${project.name}.\n<p>\nThey are automatically updated by Gradle.")

useJavaOutput()
buildConfigField("String", "ID", provider { """"$id"""" })
buildConfigField("String", "NAME", provider { """"${project.name}"""" })
buildConfigField("String", "VERSION", provider { """"${project.version}"""" })
buildConfigField("ID", id)
buildConfigField("NAME", project.name)
buildConfigField("VERSION", project.version.toString())
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)""")
}
Expand Down Expand Up @@ -113,7 +113,7 @@ tasks {
inputs.properties(expandProperties)

filesMatching("**/*.*") {
val exclusions = listOf(".png", ".obj", ".frag", ".ogg", "craftingmappings.json")
val exclusions = listOf(".png", "_at.cfg", ".refmap.json", ".obj", ".frag", ".ogg", "craftingmappings.json")
if (!exclusions.any { path.endsWith(it) })
expand(expandProperties)
}
Expand Down
234 changes: 234 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################

# Attempt to set APP_HOME

# Resolve links: $0 may be a link
app_path=$0

# Need this for daisy-chained symlinks.
while
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
[ -h "$app_path" ]
do
ls=$( ls -ld "$app_path" )
link=${ls#*' -> '}
case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

warn () {
echo "$*"
} >&2

die () {
echo
echo "$*"
echo
exit 1
} >&2

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "$( uname )" in #(
CYGWIN* ) cygwin=true ;; #(
Darwin* ) darwin=true ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
fi

# Collect all arguments for the java command, stacking in reverse order:
# * args from the command line
# * the main class name
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.

# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )

JAVACMD=$( cygpath --unix "$JAVACMD" )

# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#

eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
Loading

0 comments on commit 8d51b86

Please sign in to comment.