aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore3
-rw-r--r--build.gradle.kts107
-rw-r--r--buildSrc/build.gradle.kts18
-rw-r--r--buildSrc/src/FixMixins.kt43
-rw-r--r--gradle.properties2
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin0 -> 63721 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties7
-rwxr-xr-xgradlew249
-rw-r--r--gradlew.bat92
-rw-r--r--settings.gradle.kts18
-rw-r--r--src/main/java/moe/nea/caelo/Caelo.kt44
-rw-r--r--src/main/java/moe/nea/caelo/CaeloCommand.kt54
-rw-r--r--src/main/java/moe/nea/caelo/event/NeaTickEvent.kt7
-rw-r--r--src/main/java/moe/nea/caelo/init/MixinPlugin.java47
-rw-r--r--src/main/java/moe/nea/caelo/mixin/PatchCustomItemModelCache.java42
-rw-r--r--src/main/java/moe/nea/caelo/optifine/OptifineCustomItemCache.kt78
-rw-r--r--src/main/java/moe/nea/caelo/util/Histogram.kt17
-rw-r--r--src/main/java/moe/nea/caelo/util/InterModUtil.kt8
-rw-r--r--src/main/java/moe/nea/caelo/util/MC.kt13
-rw-r--r--src/main/resources/mcmod.info12
-rw-r--r--src/main/resources/veloxcaelo.mixins.json9
21 files changed, 870 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2fb5d70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+run
+.gradle
+build
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..45bdb49
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,107 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+ kotlin("jvm") version "1.9.22"
+ `maven-publish`
+ id("xyz.wagyourtail.unimined") version "1.2.0-SNAPSHOT"
+}
+
+group = "moe.nea"
+version = "1.0-SNAPSHOT"
+
+repositories {
+ maven("https://jitpack.io")
+ maven("https://repo.polyfrost.cc/releases")
+ mavenCentral()
+}
+
+unimined.minecraft {
+ version("1.8.9")
+ mappings {
+ searge()
+ mcp("stable", "22-1.8.9")
+ }
+ minecraftForge {
+ loader("11.15.1.2318-1.8.9")
+ mixinConfig("veloxcaelo.mixins.json")
+ }
+ runs {
+ this.config("client") {
+ this.args.addAll(listOf("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker"))
+ this.env.put(
+ "LD_LIBRARY_PATH",
+ ":/nix/store/agp6lqznayysqvqkx4k1ggr8n1rsyi8c-gcc-13.2.0-lib/lib:/nix/store/ldi0rb00gmbdg6915lhch3k3b3ib460z-libXcursor-1.2.2/lib:/nix/store/8xbbv82pabjcbj30vrna4gcz4g9q97z4-libXrandr-1.5.4/lib:/nix/store/smrb2g0addhgahkfjjl3k8rfd30gdc29-libXxf86vm-1.1.5/lib:/nix/store/lpqy1z1h8li6h3cp9ax6vifl71dks1ff-libglvnd-1.7.0/lib"
+ )
+ }
+ }
+}
+
+
+val downloadOptifine by tasks.creating {
+ val outputFile = layout.buildDirectory.file("download/optifine.jar")
+ outputs.file(outputFile)
+ doLast {
+ outputFile.get().asFile.parentFile.mkdirs()
+ uri("https://optifine.net/download?f=preview_OptiFine_1.8.9_HD_U_M6_pre2.jar")
+ .toURL()
+ .openStream().use { input ->
+ outputFile.get().asFile.outputStream().use { output ->
+ input.copyTo(output)
+ }
+ }
+ }
+}
+
+dependencies {
+ testImplementation("org.jetbrains.kotlin:kotlin-test")
+ implementation("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+ compileOnly(project.files(downloadOptifine))
+ compileOnly("org.jetbrains:annotations:24.1.0")
+}
+
+tasks.test {
+ useJUnitPlatform()
+}
+
+sourceSets.main {
+ output.setResourcesDir(sourceSets.main.flatMap { it.java.classesDirectory })
+ kotlin.destinationDirectory.set(java.destinationDirectory)
+}
+tasks.processResources {
+ filesMatching("*.mixins.json") {
+ this.filter(
+ mapOf("sourceRoots" to sourceSets.main.get().allSource.srcDirs
+ .filter { it.exists() }.joinToString(":") { it.absolutePath }),
+ MixinFilterReader::class.java
+ )//TODO: keep old existing class names in mixins array
+ }
+}
+
+tasks.compileJava {
+ dependsOn(tasks.processResources)
+}
+java {
+ targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_1_8
+}
+tasks.withType(JavaCompile::class) {
+ this.options.encoding = "UTF-8"
+}
+tasks.withType(KotlinCompile::class) {
+ this.compilerOptions {
+ this.jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
+ }
+}
+
+tasks.withType(Jar::class) {
+ destinationDirectory.set(project.layout.buildDirectory.dir("badjars"))
+ archiveBaseName.set("VeloxCaelo")
+ manifest.attributes.run {
+ this["FMLCorePluginContainsFMLMod"] = "true"
+ this["ForceLoadAsMod"] = "true"
+
+ // If you don't want mixins, remove these lines
+ this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
+ this["MixinConfigs"] = "veloxcaelo.mixins.json"
+ }
+} \ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..6799cc7
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,18 @@
+
+plugins {
+ `kotlin-dsl`
+ kotlin("jvm")version "1.8.10"
+}
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation("com.google.code.gson:gson:2.10.1")
+}
+
+sourceSets.main {
+ kotlin {
+ srcDir(file("src"))
+ }
+} \ No newline at end of file
diff --git a/buildSrc/src/FixMixins.kt b/buildSrc/src/FixMixins.kt
new file mode 100644
index 0000000..ea5f031
--- /dev/null
+++ b/buildSrc/src/FixMixins.kt
@@ -0,0 +1,43 @@
+import com.google.gson.Gson
+import com.google.gson.JsonArray
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+import org.apache.tools.ant.filters.BaseParamFilterReader
+import java.io.File
+import java.io.Reader
+import java.io.StringReader
+
+class MixinFilterReader(reader: Reader) : BaseParamFilterReader() {
+ lateinit var sourceRoots: String
+ val betterReader: StringReader by lazy {
+ StringReader(run {
+ val json = Gson().fromJson(reader.readText(), JsonObject::class.java)
+ val mixinPackage = (json["package"] as JsonPrimitive).asString
+ val allMixins = JsonArray()
+ sourceRoots
+ .split(":")
+ .map { File(it) }
+ .forEach { base ->
+ base.walk()
+ .filter { it.isFile }
+ .forEach {
+ val relativeString = it.toRelativeString(base).replace("\\", "/")
+ if (relativeString.startsWith(mixinPackage.replace(".", "/") + "/")
+ && relativeString.endsWith(".java")
+ && it.readText().contains("@Mixin")
+ )
+ allMixins.add(
+ relativeString.replace("/", ".").dropLast(5).drop(mixinPackage.length + 1)
+ )
+ }
+ }
+ json.add("mixins", allMixins)
+ Gson().toJson(json)
+ })
+
+ }
+
+ override fun read(): Int {
+ return betterReader.read()
+ }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..c873b79
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx2G
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7f93135
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..3fa8f86
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..1aa94a4
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,249 @@
+#!/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/HEAD/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
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# 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
+ if ! command -v java >/dev/null 2>&1
+ then
+ 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
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC2039,SC3045
+ 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
+
+
+# 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"'
+
+# Collect all arguments for the java command:
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+# and any embedded shellness will be escaped.
+# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+# treated as '${Hostname}' itself on the command line.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# 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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..93e3f59
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..2b77b1f
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,18 @@
+
+pluginManagement {
+ repositories {
+ mavenCentral()
+ gradlePluginPortal()
+ maven("https://oss.sonatype.org/content/repositories/snapshots")
+ maven("https://maven.architectury.dev/")
+ maven("https://maven.fabricmc.net")
+ maven("https://maven.wagyourtail.xyz/releases")
+ maven("https://maven.wagyourtail.xyz/snapshots")
+ maven("https://maven.neoforged.net/releases")
+ maven("https://maven.minecraftforge.net/")
+ maven("https://repo.spongepowered.org/maven/")
+ maven("https://repo.sk1er.club/repository/maven-releases/")
+ }
+}
+rootProject.name = "veloxcaelo"
+
diff --git a/src/main/java/moe/nea/caelo/Caelo.kt b/src/main/java/moe/nea/caelo/Caelo.kt
new file mode 100644
index 0000000..76e56bf
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/Caelo.kt
@@ -0,0 +1,44 @@
+package moe.nea.caelo
+
+import moe.nea.caelo.event.NeaTickEvent
+import moe.nea.caelo.init.MixinPlugin
+import moe.nea.caelo.optifine.OptifineCustomItemCache
+import moe.nea.caelo.util.InterModUtil
+import moe.nea.caelo.util.MC
+import net.minecraft.client.Minecraft
+import net.minecraftforge.client.ClientCommandHandler
+import net.minecraftforge.common.MinecraftForge
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent
+import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
+
+@Mod(modid = "veloxcaelo", useMetadata = true)
+class Caelo {
+ @SubscribeEvent
+ fun onTick(tick: ClientTickEvent) {
+ if (tick.phase != TickEvent.Phase.END)
+ return
+ if (Minecraft.getMinecraft().thePlayer == null)
+ return
+ MinecraftForge.EVENT_BUS.post(NeaTickEvent(tickCount++))
+ }
+
+ var tickCount = 0
+
+ @Mod.EventHandler
+ fun onInit(event: FMLInitializationEvent) {
+ if (InterModUtil.isOptifineLoaded) {
+ MinecraftForge.EVENT_BUS.register(OptifineCustomItemCache)
+ }
+ MinecraftForge.EVENT_BUS.register(this)
+ ClientCommandHandler.instance.registerCommand(CaeloCommand)
+ CaeloCommand.subcommand("mixins") { args ->
+ MC.display("Injected mixins:")
+ MixinPlugin.loadedMixinClasses.forEach {
+ MC.display(" - $it")
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/CaeloCommand.kt b/src/main/java/moe/nea/caelo/CaeloCommand.kt
new file mode 100644
index 0000000..b5a1688
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/CaeloCommand.kt
@@ -0,0 +1,54 @@
+package moe.nea.caelo
+
+import moe.nea.caelo.util.MC
+import net.minecraft.command.CommandBase
+import net.minecraft.command.ICommandSender
+import net.minecraft.util.BlockPos
+
+object CaeloCommand : CommandBase() {
+ override fun getCommandName(): String {
+ return "veloxcaelo"
+ }
+
+ override fun getCommandAliases(): List<String> {
+ return listOf("velox")
+ }
+
+ override fun canCommandSenderUseCommand(sender: ICommandSender?): Boolean {
+ return true
+ }
+
+ override fun getCommandUsage(sender: ICommandSender?): String {
+ return ""
+ }
+
+ override fun addTabCompletionOptions(
+ sender: ICommandSender?,
+ args: Array<out String>,
+ pos: BlockPos?
+ ): List<String> {
+ if (args.size == 1) {
+ return getListOfStringsMatchingLastWord(args, subcommands.keys)
+ }
+ return emptyList()
+ }
+
+ private val subcommands = mutableMapOf<String, (args: Array<String>) -> Unit>()
+
+ fun subcommand(name: String, function: (args: Array<String>) -> Unit) {
+ subcommands[name] = function
+ }
+
+ override fun processCommand(iCommandSender: ICommandSender?, args: Array<String>) {
+ if (args.isEmpty()) {
+ MC.display("§cMissing subcommand. Check the tab completions.")
+ return
+ }
+ val subCommand = subcommands[args[0]]
+ if (subCommand == null) {
+ MC.display("§cInvalid subcommand. Check the tab completions.")
+ return
+ }
+ subCommand.invoke(args)
+ }
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/event/NeaTickEvent.kt b/src/main/java/moe/nea/caelo/event/NeaTickEvent.kt
new file mode 100644
index 0000000..6121203
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/event/NeaTickEvent.kt
@@ -0,0 +1,7 @@
+package moe.nea.caelo.event
+
+import net.minecraftforge.fml.common.eventhandler.Event
+
+data class NeaTickEvent(
+ val tickCounter: Int,
+) : Event() \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/init/MixinPlugin.java b/src/main/java/moe/nea/caelo/init/MixinPlugin.java
new file mode 100644
index 0000000..fafc55d
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/init/MixinPlugin.java
@@ -0,0 +1,47 @@
+package moe.nea.caelo.init;
+
+import org.spongepowered.asm.lib.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class MixinPlugin implements IMixinConfigPlugin {
+ @Override
+ public void onLoad(String mixinPackage) {
+ }
+
+ @Override
+ public String getRefMapperConfig() {
+ return null;
+ }
+
+ @Override
+ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+ return true;
+ }
+
+ @Override
+ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
+
+ }
+
+ @Override
+ public List<String> getMixins() {
+ return null;
+ }
+
+ @Override
+ public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
+ }
+
+ public static Set<String> loadedMixinClasses = new HashSet<>();
+
+ @Override
+ public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+ loadedMixinClasses.add(mixinClassName);
+ }
+}
diff --git a/src/main/java/moe/nea/caelo/mixin/PatchCustomItemModelCache.java b/src/main/java/moe/nea/caelo/mixin/PatchCustomItemModelCache.java
new file mode 100644
index 0000000..afeafef
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/mixin/PatchCustomItemModelCache.java
@@ -0,0 +1,42 @@
+package moe.nea.caelo.mixin;
+
+import moe.nea.caelo.optifine.OptifineCustomItemCache;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.optifine.CustomItemProperties;
+import net.optifine.CustomItems;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Pseudo
+@Mixin(value = CustomItems.class, remap = false)
+public class PatchCustomItemModelCache {
+
+ @SuppressWarnings("InvalidInjectorMethodSignature")
+ @Inject(method = "getCustomItemProperties", at = @At("HEAD"), cancellable = true)
+ private static void overrideCustomItemProperties(
+ ItemStack itemStack, int type,
+ CallbackInfoReturnable<CustomItemProperties> cir) {
+ OptifineCustomItemCache.retrieveCacheHit(itemStack, type, cir);
+ }
+
+ @Inject(method = "getCustomItemProperties", at = @At(value = "RETURN", ordinal = 2),
+ locals = LocalCapture.CAPTURE_FAILHARD)
+ private static void storeCustomItemProperties(
+ ItemStack itemStack, int type, CallbackInfoReturnable<CustomItemProperties> cir,
+ Item item, int itemId, CustomItemProperties[] cips, int i, CustomItemProperties cip) {
+ OptifineCustomItemCache.storeCustomItemProperties(itemStack, type, cip);
+ }
+
+ @Inject(method = "getCustomItemProperties", at = @At(value = "RETURN", ordinal = 3))
+ private static void storeCustomItemProperties(
+ ItemStack itemStack, int type, CallbackInfoReturnable<CustomItemProperties> cir) {
+ OptifineCustomItemCache.storeNoCustomItemProperties(itemStack, type);
+ }
+
+
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/optifine/OptifineCustomItemCache.kt b/src/main/java/moe/nea/caelo/optifine/OptifineCustomItemCache.kt
new file mode 100644
index 0000000..0bd6d78
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/optifine/OptifineCustomItemCache.kt
@@ -0,0 +1,78 @@
+package moe.nea.caelo.optifine
+
+import moe.nea.caelo.CaeloCommand
+import moe.nea.caelo.event.NeaTickEvent
+import moe.nea.caelo.util.Histogram
+import moe.nea.caelo.util.MC
+import net.minecraft.item.ItemStack
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.optifine.CustomItemProperties
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
+
+object OptifineCustomItemCache {
+
+ init {
+ CaeloCommand.subcommand("opticache") { args ->
+ val cache = cacheSizeHistory.lastOrNull() ?: CacheStats()
+ MC.display("OptiCache stats:")
+ MC.display("- History: §3${cacheSizeHistory.size}")
+ MC.display("- Misses: §c${cache.cacheMisses}")
+ MC.display("- Hits: §a${cache.cacheHits}")
+ MC.display("- Entries: §b${cache.uniquePropertyBearingStacks}")
+ }
+ }
+
+ class CacheKey(val itemStack: ItemStack, val type: Int) {
+ override fun equals(other: Any?): Boolean {
+ if (other !is CacheKey) return false
+ return itemStack === other.itemStack && type == other.type
+ }
+
+ override fun hashCode(): Int {
+ return System.identityHashCode(itemStack) + type * 31
+ }
+ }
+
+ data class CacheStats(
+ var cacheHits: Int = 0,
+ var cacheMisses: Int = 0,
+ var uniquePropertyBearingStacks: Int = 0,
+ )
+
+ private val map = mutableMapOf<CacheKey, CustomItemProperties?>()
+ private val cacheSizeHistory = Histogram<CacheStats>(1000)
+ private var cacheStats = CacheStats()
+
+ @SubscribeEvent
+ fun onTick(event: NeaTickEvent) {
+ cacheSizeHistory.append(cacheStats)
+ cacheStats = CacheStats()
+ map.clear()
+ }
+
+ @JvmStatic
+ fun retrieveCacheHit(
+ itemStack: ItemStack,
+ type: Int,
+ cir: CallbackInfoReturnable<CustomItemProperties?>
+ ) {
+ val key = CacheKey(itemStack, type)
+ if (!map.containsKey(key)) {
+ cacheStats.cacheMisses++
+ return
+ }
+ cacheStats.cacheHits++
+ cir.returnValue = map[key]
+ }
+
+ @JvmStatic
+ fun storeCustomItemProperties(itemStack: ItemStack, type: Int, cip: CustomItemProperties) {
+ map[CacheKey(itemStack, type)] = cip
+ cacheStats.uniquePropertyBearingStacks++
+ }
+
+ @JvmStatic
+ fun storeNoCustomItemProperties(itemStack: ItemStack, type: Int) {
+ map[CacheKey(itemStack, type)] = null
+ }
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/util/Histogram.kt b/src/main/java/moe/nea/caelo/util/Histogram.kt
new file mode 100644
index 0000000..6c4add1
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/util/Histogram.kt
@@ -0,0 +1,17 @@
+package moe.nea.caelo.util
+
+class Histogram<T>(val maxSize: Int) : Iterable<T> {
+ private val dequeue = ArrayDeque<T>()
+ fun append(element: T) {
+ dequeue.addLast(element)
+ if (dequeue.size > maxSize) {
+ dequeue.removeFirst()
+ }
+ }
+
+ val size get() = dequeue.size
+
+ override fun iterator(): Iterator<T> {
+ return dequeue.iterator()
+ }
+} \ No newline at end of file
diff --git a/src/main/java/moe/nea/caelo/util/InterModUtil.kt b/src/main/java/moe/nea/caelo/util/InterModUtil.kt
new file mode 100644
index 0000000..d7b4e90
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/util/InterModUtil.kt
@@ -0,0 +1,8 @@
+package moe.nea.caelo.util
+
+import net.minecraftforge.fml.client.FMLClientHandler
+
+object InterModUtil {
+ val isOptifineLoaded get() = FMLClientHandler.instance().hasOptifine()
+
+}
diff --git a/src/main/java/moe/nea/caelo/util/MC.kt b/src/main/java/moe/nea/caelo/util/MC.kt
new file mode 100644
index 0000000..f05c217
--- /dev/null
+++ b/src/main/java/moe/nea/caelo/util/MC.kt
@@ -0,0 +1,13 @@
+package moe.nea.caelo.util
+
+import net.minecraft.client.Minecraft
+import net.minecraft.client.entity.EntityPlayerSP
+import net.minecraft.util.ChatComponentText
+
+object MC {
+ fun display(text: String) {
+ player?.addChatMessage(ChatComponentText("§b[Velox] §f$text"))
+ }
+
+ val player: EntityPlayerSP? get() = Minecraft.getMinecraft().thePlayer
+} \ No newline at end of file
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
new file mode 100644
index 0000000..90f1bf6
--- /dev/null
+++ b/src/main/resources/mcmod.info
@@ -0,0 +1,12 @@
+[
+ {
+ "modid": "veloxcaelo",
+ "name": "Velox Caelo",
+ "description": "The sky is not the limit",
+ "version": "1.0.0",
+ "mcversion": "1.8.9",
+ "authorList": [
+ "Linnea Gräf"
+ ]
+ }
+] \ No newline at end of file
diff --git a/src/main/resources/veloxcaelo.mixins.json b/src/main/resources/veloxcaelo.mixins.json
new file mode 100644
index 0000000..fcbd00a
--- /dev/null
+++ b/src/main/resources/veloxcaelo.mixins.json
@@ -0,0 +1,9 @@
+{
+ "package": "moe.nea.caelo.mixin",
+ "refmap": "mixins.veloxcaelo.refmap.json",
+ "plugin": "moe.nea.caelo.init.MixinPlugin",
+ "minVersion": "0.7",
+ "compatibilityLevel": "JAVA_8",
+ "mixins": [
+ ]
+} \ No newline at end of file
generated by cgit (git 2.46.0) at 2024-11-23 17:18:33 +0000