diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..41244f7 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build mod + +on: [ push, pull_request, workflow_dispatch ] + +jobs: + build: + name: Build mod + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v2 + with: + distribution: 'adopt' + java-version: '8' + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew -Pnet.minecraftforge.gradle.disableUpdateChecker=true build + - name: Upload artifacts + uses: actions/upload-artifact@v2 + with: + name: JustEnoughPatches + path: build/libs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..350a3ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,120 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +gradle.properties \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..bea78d2 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,360 @@ +import org.jetbrains.gradle.ext.Gradle +import org.jetbrains.gradle.ext.RunConfigurationContainer +import java.util.* + +plugins { + id("java-library") + id("maven-publish") + id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7" + id("eclipse") + id("com.gtnewhorizons.retrofuturagradle") version "1.3.19" +} + +// Project properties +group = "github.kasuminova.stellarcore" +version = "1.0.0" + +// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + // Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64 + vendor.set(JvmVendorSpec.AZUL) + } + // Generate sources and javadocs jars when building and publishing + withSourcesJar() + withJavadocJar() +} + +// Most RFG configuration lives here, see the JavaDoc for com.gtnewhorizons.retrofuturagradle.MinecraftExtension +minecraft { + mcVersion.set("1.12.2") + + // Username for client run configurations + username.set("Kasumi_Nova") + + // Generate a field named VERSION with the mod version in the injected Tags class + injectedTags.put("VERSION", project.version) + + // If you need the old replaceIn mechanism, prefer the injectTags task because it doesn't inject a javac plugin. + // tagReplacementFiles.add("RfgExampleMod.java") + + // Enable assertions in the mod's package when running the client or server + val args = mutableListOf("-ea:${project.group}") + + // Mixin args + args.add("-Dmixin.hotSwap=true") + args.add("-Dmixin.checks.interfaces=true") + args.add("-Dmixin.debug.export=true") + extraRunJvmArguments.addAll(args) + + // If needed, add extra tweaker classes like for mixins. + // extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") + + // Exclude some Maven dependency groups from being automatically included in the reobfuscated runs + groupsToExcludeFromAutoReobfMapping.addAll("com.diffplug", "com.diffplug.durian", "net.industrial-craft") +} + +// Generates a class named rfg.examplemod.Tags with the mod version in it, you can find it at +tasks.injectTags.configure { + outputClassName.set("${project.group}.Tags") +} + +// Put the version from gradle into mcmod.info +tasks.processResources.configure { +// inputs.property("version", project.version) +// +// filesMatching("mcmod.info") { +// expand(mapOf("version" to project.version)) +// } +} + +tasks.compileJava.configure { + sourceCompatibility = "17" + options.release = 8 + options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation + + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.compileTestJava.configure { + sourceCompatibility = "17" + options.release = 8 + options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation + + javaCompiler = javaToolchains.compilerFor { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.javadoc.configure { + // No need for JavaDoc. + actions = Collections.emptyList() +} + + +tasks.jar.configure { + manifest { + val attributes = manifest.attributes + attributes["FMLCorePlugin"] = "github.kasuminova.jep.mixin.JEPEarlyMixinLoader" + attributes["FMLCorePluginContainsFMLMod"] = true + } +} + +// Create a new dependency type for runtime-only dependencies that don't get included in the maven publication +val runtimeOnlyNonPublishable: Configuration by configurations.creating { + description = "Runtime only dependencies that are not published alongside the jar" + isCanBeConsumed = false + isCanBeResolved = false +} +listOf(configurations.runtimeClasspath, configurations.testRuntimeClasspath).forEach { + it.configure { + extendsFrom( + runtimeOnlyNonPublishable + ) + } +} + +//tasks.deobfuscateMergedJarToSrg.configure { +// accessTransformerFiles.from("src/main/resources/META-INF/justenoughpatches_at.cfg") +//} +//tasks.srgifyBinpatchedJar.configure { +// accessTransformerFiles.from("src/main/resources/META-INF/justenoughpatches_at.cfg") +//} + +// Dependencies +repositories { + flatDir { + dirs("lib") + } + maven { + url = uri("https://maven.aliyun.com/nexus/content/groups/public/") + } + maven { + url = uri("https://maven.aliyun.com/nexus/content/repositories/jcenter") + } + maven { + url = uri("https://maven.cleanroommc.com") + } + maven { + url = uri("https://cfa2.cursemaven.com") + } + maven { + url = uri("https://cursemaven.com") + } + maven { + url = uri("https://maven.blamejared.com/") + } + maven { + url = uri("https://repo.spongepowered.org/maven") + } + maven { + name = "GeckoLib" + url = uri("https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/") + } + maven { + name = "OvermindDL1 Maven" + url = uri("https://gregtech.overminddl1.com/") + mavenContent { + excludeGroup("net.minecraftforge") // missing the `universal` artefact + } + } + maven { + name = "GTNH Maven" + url = uri("http://jenkins.usrv.eu:8081/nexus/content/groups/public/") + isAllowInsecureProtocol = true + } +} + +//mixin { +// add sourceSets.main, "mixins.justenoughpatches.refmap.json" +//} + +dependencies { + annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2") + compileOnly("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2") + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor("net.java.dev.jna:jna-platform:5.13.0") + // Allow jdk.unsupported classes like sun.misc.Unsafe, workaround for JDK-8206937 and fixes Forge crashes in tests. + patchedMinecraft("me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0") + // allow Jabel to work in tests + testAnnotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:1.0.0") + testCompileOnly("com.github.bsideup.jabel:jabel-javac-plugin:1.0.0") { + isTransitive = false // We only care about the 1 annotation class + } + testCompileOnly("me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0") + + // Mixins +// implementation("zone.rong:mixinbooter:7.1") + val mixin : String = modUtils.enableMixins("zone.rong:mixinbooter:8.9", "mixins.justenoughpatches.refmap.json").toString() + api (mixin) { + isTransitive = false + } + annotationProcessor("org.ow2.asm:asm-debug-all:5.2") + annotationProcessor("com.google.guava:guava:30.0-jre") + annotationProcessor("com.google.code.gson:gson:2.8.9") + annotationProcessor (mixin) { + isTransitive = false + } + + // Mod Dependencies + implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+") + implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+") + compileOnly(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:4991928")) + implementation(rfg.deobf("curse.maven:had-enough-items-557549:4810661")) + implementation(rfg.deobf("curse.maven:the-one-probe-245211:2667280")) + compileOnly(rfg.deobf("curse.maven:ae2-extended-life-570458:5147702")) +// implementation(rfg.deobf("curse.maven:applied-energistics-2-223794:2747063")) + compileOnly(rfg.deobf("curse.maven:tx-loader-706505:4515357")) + compileOnly(rfg.deobf("curse.maven:CodeChickenLib-242818:2779848")) + compileOnly(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197")) + compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604")) + compileOnly(rfg.deobf("curse.maven:mekanism-unofficial-edition-v10-edition-840735:4464199")) + compileOnly(rfg.deobf("curse.maven:RedstoneFlux-270789:2920436")) + compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2920433")) + compileOnly(rfg.deobf("curse.maven:cofh-world-271384:2920434")) + compileOnly(rfg.deobf("curse.maven:thermal-foundation-222880:2926428")) + compileOnly(rfg.deobf("curse.maven:thermal-innovation-291737:2920441")) + compileOnly(rfg.deobf("curse.maven:thermal-expansion-69163:2926431")) + compileOnly(rfg.deobf("curse.maven:botania-225643:3330934")) + compileOnly(rfg.deobf("curse.maven:astral-sorcery-241721:3044416")) + compileOnly(rfg.deobf("curse.maven:baubles-227083:2518667")) + compileOnly(rfg.deobf("curse.maven:matter-overdrive-community-edition-557428:4592069")) + compileOnly(rfg.deobf("curse.maven:zenutil-401178:4394263")) + compileOnly(rfg.deobf("curse.maven:libvulpes-236541:3801015")) + compileOnly(rfg.deobf("curse.maven:advanced-rocketry-236542:4671856")) + implementation(rfg.deobf("curse.maven:immersive-engineering-231951:2974106")) + implementation(rfg.deobf("curse.maven:immersive-petroleum-268250:3382321")) + compileOnly(rfg.deobf("curse.maven:valkyrielib-245480:2691542")) + compileOnly(rfg.deobf("curse.maven:environmental-tech-245453:2691536")) + compileOnly(rfg.deobf("curse.maven:smooth-font-285742:3944565")) + compileOnly(rfg.deobf("curse.maven:athenaeum-284350:4633750")) + compileOnly(rfg.deobf("curse.maven:artisan-worktables-284351:3205284")) + compileOnly(rfg.deobf("curse.maven:touhou-little-maid-355044:3576415")) + compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566")) + compileOnly(rfg.deobf("curse.maven:lunatriuscore-225605:2489549")) + compileOnly(rfg.deobf("curse.maven:rgb-chat-702720:4092100")) + compileOnly(rfg.deobf("software.bernie.geckolib:geckolib-forge-1.12.2:3.0.31")) + compileOnly(rfg.deobf("curse.maven:endercore-231868:4671384")) + compileOnly(rfg.deobf("curse.maven:ender-io-64578:4674244")) + compileOnly(rfg.deobf("curse.maven:tinkers-evolution-384589:4941753")) + compileOnly(rfg.deobf("curse.maven:ore-excavation-250898:2897369")) + compileOnly(rfg.deobf("curse.maven:techguns-244201:2958103")) + compileOnly(rfg.deobf("curse.maven:biomes-o-plenty-220318:3558882")) + compileOnly(rfg.deobf("curse.maven:more-electric-tools-366298:3491973")) + compileOnly(rfg.deobf("curse.maven:brandonscore-231382:3051539")) + compileOnly(rfg.deobf("curse.maven:draconicevolution-223565:3051542")) + compileOnly(rfg.deobf("curse.maven:tinkers-construct-74072:2902483")) + compileOnly(rfg.deobf("curse.maven:thermal-dynamics-227443:2920505")) + compileOnly(rfg.deobf("curse.maven:armourers-workshop-229523:3101995")) + compileOnly(rfg.deobf("curse.maven:avaritia-1-10-261348:3143349")) + compileOnly(rfg.deobf("curse.maven:blood-magic-224791:2822288")) + compileOnly(rfg.deobf("curse.maven:legendary-tooltips-532127:4499615")) + compileOnly(rfg.deobf("curse.maven:ftb-quests-forge-289412:3156637")) + compileOnly(rfg.deobf("curse.maven:flux-networks-248020:3178199")) + compileOnly(rfg.deobf("curse.maven:scalingguis-319656:2716334")) + compileOnly(rfg.deobf("curse.maven:chisel-235279:2915375")) + compileOnly(rfg.deobf("curse.maven:extrabotany-299086:3112313")) + compileOnly(rfg.deobf("curse.maven:better-loading-screen-229302:3769828")) + compileOnly(rfg.deobf("curse.maven:better-chat-363860:3048407")) + compileOnly(rfg.deobf("curse.maven:mrcrayfish-furniture-mod-55438:3865259")) +} + +// Publishing to a Maven repository +publishing { + publications { + create("maven") { + from(components["java"]) + } + } + repositories { +// // Example: publishing to the GTNH Maven repository +// maven { +// url = uri("http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") +// isAllowInsecureProtocol = true +// credentials { +// username = System.getenv("MAVEN_USER") ?: "NONE" +// password = System.getenv("MAVEN_PASSWORD") ?: "NONE" +// } +// } + } +} + +// IDE Settings +//eclipse { +// classpath { +// isDownloadSources = true +// isDownloadJavadoc = true +// } +//} + +idea { + module { + isDownloadJavadoc = true + isDownloadSources = true + inheritOutputDirs = true // Fix resources in IJ-Native runs + } + project { + this.withGroovyBuilder { + "settings" { + "runConfigurations" { + val self = this.delegate as RunConfigurationContainer + self.add(Gradle("1. Run Client").apply { + setProperty("taskNames", listOf("runClient")) + }) + self.add(Gradle("2. Run Server").apply { + setProperty("taskNames", listOf("runServer")) + }) + self.add(Gradle("3. Run Obfuscated Client").apply { + setProperty("taskNames", listOf("runObfClient")) + }) + self.add(Gradle("4. Run Obfuscated Server").apply { + setProperty("taskNames", listOf("runObfServer")) + }) + /* + These require extra configuration in IntelliJ, so are not enabled by default + self.add(Application("Run Client (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStart" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runClient = tasks.runClient.get() + workingDirectory = runClient.workingDir.absolutePath + programParameters = runClient.calculateArgs(project).map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runClient.calculateJvmArgs(project).map { '"' + it + '"' }.joinToString(" ") + + ' ' + runClient.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + self.add(Application("Run Server (IJ Native, Deprecated)", project).apply { + mainClass = "GradleStartServer" + moduleName = project.name + ".ideVirtualMain" + afterEvaluate { + val runServer = tasks.runServer.get() + workingDirectory = runServer.workingDir.absolutePath + programParameters = runServer.calculateArgs(project).map { '"' + it + '"' }.joinToString(" ") + jvmArgs = runServer.calculateJvmArgs(project).map { '"' + it + '"' }.joinToString(" ") + + ' ' + runServer.systemProperties.map { "\"-D" + it.key + '=' + it.value.toString() + '"' } + .joinToString(" ") + } + }) + */ + } + "compiler" { + val self = this.delegate as org.jetbrains.gradle.ext.IdeaCompilerConfiguration + afterEvaluate { + self.javac.moduleJavacAdditionalOptions = mapOf( + (project.name + ".main") to + tasks.compileJava.get().options.compilerArgs.map { '"' + it + '"' }.joinToString(" ") + ) + } + } + } + } + } +} + +tasks.processIdeaSettings.configure { + dependsOn(tasks.injectTags) +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..15de902 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..3da45c1 --- /dev/null +++ b/gradlew @@ -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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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=. +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%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..648e4b3 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name = "GTNH Maven" + url = uri("http://jenkins.usrv.eu:8081/nexus/content/groups/public/") + isAllowInsecureProtocol = true + mavenContent { + includeGroup("com.gtnewhorizons") + includeGroup("com.gtnewhorizons.retrofuturagradle") + } + } + gradlePluginPortal() + mavenCentral() + mavenLocal() + } +} + +plugins { + // Automatic toolchain provisioning + id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" +} + +rootProject.name = "StellarCore" diff --git a/src/main/java/github/kasuminova/stellarcore/StellarCore.java b/src/main/java/github/kasuminova/stellarcore/StellarCore.java new file mode 100644 index 0000000..8429a51 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/StellarCore.java @@ -0,0 +1,57 @@ +package github.kasuminova.stellarcore; + +import github.kasuminova.stellarcore.common.CommonProxy; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.SidedProxy; +import net.minecraftforge.fml.common.event.*; +import org.apache.logging.log4j.Logger; + +@Mod(modid = StellarCore.MOD_ID, name = StellarCore.MOD_NAME, version = StellarCore.VERSION, + dependencies = "required-after:forge@[14.23.5.2847,);" + + "required-after:theoneprobe@[1.12-1.4.28,);" + + "after:jianghun@[1.0,);", + acceptedMinecraftVersions = "[1.12, 1.13)" +) +@SuppressWarnings("MethodMayBeStatic") +public class StellarCore { + public static final String MOD_ID = "stellarcore"; + public static final String MOD_NAME = "Stellar Core"; + + public static final String VERSION = Tags.VERSION; + + public static final String CLIENT_PROXY = "github.kasuminova.stellarcore.client.ClientProxy"; + public static final String COMMON_PROXY = "github.kasuminova.stellarcore.common.CommonProxy"; + + @Mod.Instance(MOD_ID) + public static StellarCore instance = null; + @SidedProxy(clientSide = CLIENT_PROXY, serverSide = COMMON_PROXY) + public static CommonProxy proxy = null; + public static Logger log = null; + + @Mod.EventHandler + public void construction(FMLConstructionEvent event) { + proxy.construction(); + } + + @Mod.EventHandler + public void preInit(FMLPreInitializationEvent event) { + event.getModMetadata().version = VERSION; + log = event.getModLog(); + proxy.preInit(); + } + + @Mod.EventHandler + public void init(FMLInitializationEvent event) { + proxy.init(); + } + + @Mod.EventHandler + public void postInit(FMLPostInitializationEvent event) { + proxy.postInit(); + } + + @Mod.EventHandler + public void loadComplete(FMLLoadCompleteEvent event) { + proxy.loadComplete(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java b/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java new file mode 100644 index 0000000..be95b33 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/ClientProxy.java @@ -0,0 +1,55 @@ +package github.kasuminova.stellarcore.client; + + +import github.kasuminova.stellarcore.client.handler.ClientEventHandler; +import github.kasuminova.stellarcore.client.hitokoto.HitokotoAPI; +import github.kasuminova.stellarcore.common.CommonProxy; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.relauncher.Side; + +import java.util.concurrent.CompletableFuture; + +@Mod.EventBusSubscriber(Side.CLIENT) +public class ClientProxy extends CommonProxy { + + static { + CompletableFuture.runAsync(HitokotoAPI::getRandomHitokoto); + } + + public ClientProxy() { + MinecraftForge.EVENT_BUS.register(this); + } + + @Override + public void construction() { + super.construction(); + } + + @Override + public void preInit() { + super.preInit(); + MinecraftForge.EVENT_BUS.register(ClientEventHandler.INSTANCE); + } + + @Override + public void init() { + super.init(); + } + + @Override + public void postInit() { + super.postInit(); + } + + @Override + public void loadComplete() { + super.loadComplete(); + } + + @SubscribeEvent + public void onModelRegister(ModelRegistryEvent event) { + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java new file mode 100644 index 0000000..0fccbde --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java @@ -0,0 +1,187 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.fred.jianghun.truergb.IColor; +import com.fred.jianghun.truergb.RGBSettings; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.Tuple; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.*; +import java.util.List; +import java.util.*; + +public class CachedRGBFontRenderer extends FontRenderer { + private static final Map> TEXT_RENDER_CACHE = new WeakHashMap<>(); + private static final Map> LISTED_CACHE = new WeakHashMap<>(); + + CachedRGBFontRenderer(final GameSettings gameSettingsIn, final ResourceLocation location, final TextureManager textureManagerIn, final boolean unicode) { + super(gameSettingsIn, location, textureManagerIn, unicode); + } + + public static void overrideFontRenderer() { + Minecraft mc = Minecraft.getMinecraft(); + CachedRGBFontRenderer renderer = new CachedRGBFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false); + + mc.fontRenderer = renderer; + if (mc.gameSettings.language != null) { + renderer.setUnicodeFlag(mc.isUnicode()); + renderer.setBidiFlag(mc.getLanguageManager().isCurrentLanguageBidirectional()); + } + } + + public static List mapListedString(List listed, LinkedList strList, LinkedList colors) { + List mapped = new ArrayList<>(); + + StringBuilder mapping = new StringBuilder(); + + int lastMappedLineIndex = 0; + int lastMappedLineStrIndex = 0; + for (int i = 0; i < listed.size(); i++) { + final String s = listed.get(i); + + int lastMappedStrIndex = 0; + StringBuilder sb = new StringBuilder(); + for (final char ch : s.toCharArray()) { + mapping.append(ch); + + String strFirst = strList.getFirst(); + if (strFirst == null || colors.getFirst() == null) { + sb.append(ch); + continue; + } + + if (strFirst.contentEquals(mapping)) { + String color = colors.pollFirst(); + sb.insert(lastMappedStrIndex, color); + sb.append(ch); + + if (lastMappedLineIndex + 1 == i) { + StringBuilder lastMappedStrSb = new StringBuilder(mapped.get(lastMappedLineIndex)); + lastMappedStrSb.insert(lastMappedLineStrIndex, color); + mapped.set(lastMappedLineIndex, lastMappedStrSb.toString()); + } + + lastMappedLineIndex = i; + lastMappedStrIndex = sb.length(); + strList.pollFirst(); + mapping.setLength(0); + } else { + sb.append(ch); + } + } + + lastMappedLineStrIndex = lastMappedStrIndex; + mapped.add(sb.toString()); + } + + return mapped; + } + + /** + * 如果有看不懂的代码，缓存就是终极的解决方案。 + */ + public int drawString(@Nullable String text, float x, float y, int color, boolean dropShadow) { + if (text == null) { + return 0; // 如果文本为null，则直接返回0 + } + TextRenderInfo textRenderInfo = new TextRenderInfo(text, color); + + List cachedRenderFunction = TEXT_RENDER_CACHE.get(textRenderInfo); + if (cachedRenderFunction != null) { + return fastDrawString(x, y, dropShadow, cachedRenderFunction); + } + + cachedRenderFunction = new LinkedList<>(); + + // 将文本拆分为字符串和相应的RGB设置 + List> settings = RGBSettings.split(text); + int currentColorHex = color; // 初始颜色为传递的颜色参数 + this.posX = x; // 设置 X 坐标起始位置 + + for (final Tuple setting : settings) { + String s = setting.getFirst(); // 获取字符串 + RGBSettings set = setting.getSecond(); // 获取RGB设置 + + // 如果RGB设置中指定了固定颜色，使用该颜色绘制整个字符串 + if (set.isFixedColor()) { + currentColorHex = Optional.ofNullable(set.getColorAt(0)).map(IColor::toInt).orElse(color); + + Color currentColor = new Color(currentColorHex); + final int finalCurrentColor = new Color(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue(), color >> 24 & 255).getRGB(); + final String toRender = set.getFormatString() + s; + cachedRenderFunction.add((_y, _dropShadow) -> super.drawString(toRender, this.posX, _y, finalCurrentColor, _dropShadow)); + continue; + } + + // 如果RGB设置中没有指定固定颜色，为每个字符分别指定颜色并绘制 + for (int i = 0; i < s.length(); ++i) { + currentColorHex = Optional.ofNullable(set.getColorAt(i)).map(IColor::toInt).orElse(color); + + Color currentColor = new Color(currentColorHex); + final int finalCurrentColor = new Color(currentColor.getRed(), currentColor.getGreen(), currentColor.getBlue(), color >> 24 & 255).getRGB(); + final String toRender = set.getFormatString() + s.charAt(i); + cachedRenderFunction.add((_y, _dropShadow) -> super.drawString(toRender, this.posX, _y, finalCurrentColor, _dropShadow)); + } + } + + TEXT_RENDER_CACHE.put(textRenderInfo, cachedRenderFunction); + return fastDrawString(x, y, dropShadow, cachedRenderFunction); // 返回 X 坐标的最终位置 + } + + public int fastDrawString(float x, float y, boolean dropShadow, final List renderFunctions) { + this.posX = x; + + for (final TextRenderFunction renderFunction : renderFunctions) { + renderFunction.renderText(y, dropShadow); + } + + GlStateManager.color(1.0F, 1.0F, 1.0F); + return (int) this.posX; + } + + // 获取字符串的宽度 + public int getStringWidth(@Nullable String text) { + if (text == null) { + return 0; + } + + StringBuilder sb = new StringBuilder(); + for (Tuple stringRGBSettingsTuple : RGBSettings.split(text)) { + String first = stringRGBSettingsTuple.getFirst(); + sb.append(first); + } + return super.getStringWidth(sb.toString()); + } + + @Nonnull + @Override + public List listFormattedStringToWidth(@Nonnull final String content, final int wrapWidth) { + TextWrapInfo wrapInfo = new TextWrapInfo(content, wrapWidth); + List cachedListed = LISTED_CACHE.get(wrapInfo); + if (cachedListed != null) { + return cachedListed; + } + + StringBuilder sb = new StringBuilder(); + + LinkedList strList = new LinkedList<>(); + LinkedList rgbSettingList = new LinkedList<>(); + + for (Tuple strSettings : RGBSettingsUtils.splitRGBAndContents(content)) { + rgbSettingList.add(strSettings.getFirst()); + String str = strSettings.getSecond(); + sb.append(str); + strList.add(str.replace("\n", "")); + } + + cachedListed = mapListedString(super.listFormattedStringToWidth(sb.toString(), wrapWidth), strList, rgbSettingList); + LISTED_CACHE.put(wrapInfo, cachedListed); + return cachedListed; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java new file mode 100644 index 0000000..aa1676e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/RGBSettingsUtils.java @@ -0,0 +1,97 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.fred.jianghun.truergb.Colors; +import com.fred.jianghun.truergb.RGBSettings; +import com.fred.jianghun.truergb.Utils; +import github.kasuminova.stellarcore.mixin.rgbchat.MixinRGBSettings; +import net.minecraft.util.Tuple; +import net.minecraft.util.text.TextFormatting; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.regex.Matcher; +import java.util.stream.Collectors; + +public class RGBSettingsUtils { + + public static List> splitRGBAndContents(String str) { + if (str != null && !str.isEmpty()) { + List> result = new ArrayList<>(); + Matcher matcher = RGBSettings.PATTERN.matcher(str); + + int index = 0; + RGBSettings lastSettings = RGBSettings.EMPTY; + + while (matcher.find(index)) { + String subString = str.substring(index, matcher.start()); + if (!subString.isEmpty()) { + lastSettings.addLength(subString.length()); + result.add(new Tuple<>(serializeRGBSettings(lastSettings), subString)); + } + + String format = matcher.group(); + if (format.startsWith("#")) { + String fString = matcher.group("rgb"); + lastSettings = new RGBSettings(Arrays.stream(fString.split("-")).map(Colors::of).collect(Collectors.toList())); + } else if (format.startsWith("§")) { + TextFormatting formatting = Utils.formattingOf(format.charAt(1)); + if (formatting == null) { + throw new NullPointerException("Format: " + format); + } + lastSettings = lastSettings.withFormat(formatting); + } else { + throw new IllegalStateException("Format: " + format); + } + + index = matcher.end(); + } + + String remainingString = str.substring(index); + lastSettings.addLength(remainingString.length()); + result.add(new Tuple<>(serializeRGBSettings(lastSettings), remainingString)); + + return result; + } else { + return Collections.singletonList(new Tuple<>("", "")); + } + } + + public static String serializeRGBSettings(RGBSettings rgbSettings) { + StringBuilder result = new StringBuilder(); + + // Serialize colors + List colorStrings = ((MixinRGBSettings) rgbSettings).getColors().stream() + .map(color -> String.format("%06X", color.toInt() & 0xFFFFFF)) + .collect(Collectors.toList()); + if (!colorStrings.isEmpty()) { + result.append('#').append(String.join("-", colorStrings)); + } + + // Serialize control codes + Boolean bold = rgbSettings.getBold(); + if (bold != null && bold) { + result.append("§l"); + } + Boolean italic = rgbSettings.getItalic(); + if (italic != null && italic) { + result.append("§o"); + } + Boolean underlined = rgbSettings.getUnderlined(); + if (underlined != null && underlined) { + result.append("§n"); + } + Boolean strikethrough = rgbSettings.getStrikethrough(); + if (strikethrough != null && strikethrough) { + result.append("§m"); + } + Boolean obfuscated = rgbSettings.getObfuscated(); + if (obfuscated != null && obfuscated) { + result.append("§k"); + } + + return result.toString(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java new file mode 100644 index 0000000..460be07 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderFunction.java @@ -0,0 +1,7 @@ +package github.kasuminova.stellarcore.client.gui.font; + +public interface TextRenderFunction { + + void renderText(float y, boolean dropShadow); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java new file mode 100644 index 0000000..99be5b0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextRenderInfo.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.github.bsideup.jabel.Desugar; + +import java.util.Objects; + +@Desugar +public record TextRenderInfo(String info, int color) { + + @Override + public boolean equals(final Object o) { + if (o instanceof TextRenderInfo renderInfo) { + return renderInfo.hashCode() == hashCode(); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(info, color); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java new file mode 100644 index 0000000..eceab1d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/gui/font/TextWrapInfo.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.client.gui.font; + +import com.github.bsideup.jabel.Desugar; + +import java.util.Objects; + +@Desugar +public record TextWrapInfo(String info, int wrapWidth) { + + @Override + public boolean equals(final Object o) { + if (o instanceof TextWrapInfo renderInfo) { + return renderInfo.hashCode() == hashCode(); + } + return false; + } + + @Override + public int hashCode() { + return Objects.hash(info, wrapWidth); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java b/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java new file mode 100644 index 0000000..b77a835 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/handler/ClientEventHandler.java @@ -0,0 +1,59 @@ +package github.kasuminova.stellarcore.client.handler; + +import github.kasuminova.stellarcore.StellarCore; +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import github.kasuminova.stellarcore.client.profiler.TEUpdatePacketProfiler; +import net.minecraft.client.Minecraft; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; + +import java.util.ArrayList; +import java.util.List; + +public class ClientEventHandler { + public static final ClientEventHandler INSTANCE = new ClientEventHandler(); + + public static int debugPacketProfilerMessageLimit = 5; + public static int debugTEPacketProfilerMessageLimit = 5; + + private long clientTick = 0; + + private final List debugMessageCache = new ArrayList<>(); + private boolean debugMessageUpdateRequired = true; + + private ClientEventHandler() { + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase != TickEvent.Phase.START) { + return; + } + clientTick++; + + if (clientTick % 5 == 0) { + debugMessageUpdateRequired = true; + } + } + + @SubscribeEvent + public void onDebugText(RenderGameOverlayEvent.Text event) { + if (!Minecraft.getMinecraft().gameSettings.showDebugInfo) { + return; + } + + if (debugMessageUpdateRequired) { + debugMessageUpdateRequired = false; + debugMessageCache.clear(); + debugMessageCache.add(""); + debugMessageCache.add(TextFormatting.BLUE + "[JustEnoughPatches] Ver: " + StellarCore.VERSION); + debugMessageCache.addAll(PacketProfiler.getProfilerMessages(debugPacketProfilerMessageLimit)); + debugMessageCache.addAll(TEUpdatePacketProfiler.getProfilerMessages(debugTEPacketProfilerMessageLimit)); + } + + List right = event.getRight(); + right.addAll(debugMessageCache); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java new file mode 100644 index 0000000..bd8c820 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoAPI.java @@ -0,0 +1,100 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.minecraft.util.JsonUtils; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.charset.StandardCharsets; + +public class HitokotoAPI { + public static final String API_URL = "https://v1.hitokoto.cn/"; + + public static String hitokotoCache = null; + + private static final Gson DESERIALIZER = new GsonBuilder() + .registerTypeHierarchyAdapter(HitokotoResult.class, new HitokotoDeserializer()) + .create(); + + public static String getHitokotoCache() { + return hitokotoCache; + } + + public static String getRandomHitokoto() { + if (hitokotoCache != null) { + return hitokotoCache; + } + + String jsonStr; + try { + jsonStr = getStringFromURL(API_URL); + } catch (IOException e) { + return ""; + } + + if (jsonStr == null || jsonStr.isEmpty()) { + return ""; + } + + HitokotoResult hitokoto; + try { + hitokoto = JsonUtils.fromJson(DESERIALIZER, jsonStr, HitokotoResult.class, true); + } catch (Exception e) { + return ""; + } + + if (hitokoto == null) { + return ""; + } + + String assembled = assembleHitokoto(hitokoto); + if (!assembled.isEmpty()) { + hitokotoCache = assembled; + } + return assembled; + } + + public static String assembleHitokoto(HitokotoResult result) { + String hitokoto = result.getHitokoto(); + String fromWho = result.getFromWho(); + if (fromWho.isEmpty()) { + fromWho = result.getFrom(); + if (fromWho.isEmpty()) { + fromWho = result.getCreator(); + } + } + + if (hitokoto != null && fromWho != null) { + return hitokoto + " —— " + fromWho; + } + + return ""; + } + + public static String getStringFromURL(String urlStr) throws IOException { + try { + URL url = new URL(urlStr); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.connect(); + BufferedReader reader = new BufferedReader( + new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8)); + + String line; + StringBuilder stringBuilder = new StringBuilder(); + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + } + + reader.close(); + connection.disconnect(); + return stringBuilder.toString(); + } catch (MalformedURLException e) { + return null; + } + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java new file mode 100644 index 0000000..c7f718c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoDeserializer.java @@ -0,0 +1,55 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +import com.google.gson.*; + +import java.lang.reflect.Type; + +public class HitokotoDeserializer implements JsonDeserializer { + + @Override + public HitokotoResult deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException { + JsonObject root = json.getAsJsonObject(); + HitokotoResult result = new HitokotoResult(); + + result.setId(getJsonNodeInt(root, "id")) + .setUUID(getJsonNodeString(root, "uuid")) + .setHitokoto(getJsonNodeString(root, "hitokoto")) + .setType(getJsonNodeString(root, "type")) + .setFrom(getJsonNodeString(root, "from")) + .setFromWho(getJsonNodeString(root, "from_who")) + .setCreator(getJsonNodeString(root, "creator")) + .setCreatorUid(getJsonNodeInt(root, "creator_uid")) + .setReviewer(getJsonNodeInt(root, "reviewer")) + .setCommitFrom(getJsonNodeString(root, "commit_from")) + .setCreatedAt(getJsonNodeString(root, "created_at")) + .setLength(getJsonNodeInt(root, "length")); + + return result; + } + + private static int getJsonNodeInt(JsonObject json, String memberName) { + if (json.has(memberName)) { + JsonElement element = json.get(memberName); + if (element.isJsonPrimitive()) { + JsonPrimitive primitive = element.getAsJsonPrimitive(); + if (primitive.isNumber()) { + return primitive.getAsInt(); + } + } + } + return -1; + } + + private static String getJsonNodeString(JsonObject json, String memberName) { + if (json.has(memberName)) { + JsonElement element = json.get(memberName); + if (element.isJsonPrimitive()) { + JsonPrimitive primitive = element.getAsJsonPrimitive(); + if (primitive.isString()) { + return primitive.getAsString(); + } + } + } + return ""; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java new file mode 100644 index 0000000..a5a8623 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/hitokoto/HitokotoResult.java @@ -0,0 +1,126 @@ +package github.kasuminova.stellarcore.client.hitokoto; + +@SuppressWarnings("unused") +public class HitokotoResult { + private int id; + private String uuid; + private String hitokoto; + private String type; + private String from; + private String fromWho; + private String creator; + private int creatorUid; + private int reviewer; + private String commitFrom; + private String createdAt; + private int length; + + public int getId() { + return id; + } + + public HitokotoResult setId(final int id) { + this.id = id; + return this; + } + + public String getUuid() { + return uuid; + } + + public HitokotoResult setUUID(final String uuid) { + this.uuid = uuid; + return this; + } + + public String getHitokoto() { + return hitokoto; + } + + @SuppressWarnings("UnusedReturnValue") + public HitokotoResult setHitokoto(final String hitokoto) { + this.hitokoto = hitokoto; + return this; + } + + public String getType() { + return type; + } + + public HitokotoResult setType(final String type) { + this.type = type; + return this; + } + + public String getFrom() { + return from; + } + + public HitokotoResult setFrom(final String from) { + this.from = from; + return this; + } + + public String getFromWho() { + return fromWho; + } + + public HitokotoResult setFromWho(final String fromWho) { + this.fromWho = fromWho; + return this; + } + + public String getCreator() { + return creator; + } + + public HitokotoResult setCreator(final String creator) { + this.creator = creator; + return this; + } + + public int getCreatorUid() { + return creatorUid; + } + + public HitokotoResult setCreatorUid(final int creatorUid) { + this.creatorUid = creatorUid; + return this; + } + + public int getReviewer() { + return reviewer; + } + + public HitokotoResult setReviewer(final int reviewer) { + this.reviewer = reviewer; + return this; + } + + public String getCommitFrom() { + return commitFrom; + } + + public HitokotoResult setCommitFrom(final String commitFrom) { + this.commitFrom = commitFrom; + return this; + } + + public String getCreatedAt() { + return createdAt; + } + + public HitokotoResult setCreatedAt(final String createdAt) { + this.createdAt = createdAt; + return this; + } + + public int getLength() { + return length; + } + + public HitokotoResult setLength(final int length) { + this.length = length; + return this; + } +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java b/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java new file mode 100644 index 0000000..8355b52 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/profiler/PacketProfiler.java @@ -0,0 +1,103 @@ +package github.kasuminova.stellarcore.client.profiler; + +import hellfirepvp.modularmachinery.common.util.MiscUtils; +import net.minecraft.network.Packet; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.util.Tuple; +import net.minecraft.util.text.TextFormatting; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Collectors; + +public class PacketProfiler { + public static final ConcurrentHashMap, Tuple> PACKET_TOTAL_SIZE = new ConcurrentHashMap<>(); + public static final AtomicLong TOTAL_RECEIVED_DATA_SIZE = new AtomicLong(0); + + public static boolean enabled = false; + + public static long profilerStartTime = 0; + public static long profilerStopTime = 0; + + public static void onPacketReceived(Object packet, int packetSize) { + if (!enabled) { + return; + } + + if (PACKET_TOTAL_SIZE.isEmpty()) { + profilerStartTime = System.currentTimeMillis(); + } + + PACKET_TOTAL_SIZE.compute(packet.getClass(), (key, value) -> value == null + ? new Tuple<>(1L, (long) packetSize) + : new Tuple<>(value.getFirst() + 1, value.getSecond() + packetSize)); + + if (packet instanceof SPacketUpdateTileEntity) { + TEUpdatePacketProfiler.onPacketReceived((SPacketUpdateTileEntity) packet, packetSize); + } + } + + public static void onPacketDecoded(final int length) { + if (!enabled) { + return; + } + + TOTAL_RECEIVED_DATA_SIZE.addAndGet(length); + } + + public static List getProfilerMessages(final int limit) { + List messages = new LinkedList<>(); + + long totalPacketSize = TOTAL_RECEIVED_DATA_SIZE.get(); + + long profileTimeExisted = enabled ? System.currentTimeMillis() - profilerStartTime : profilerStopTime - profilerStartTime; + double networkBandwidthPerSec = profileTimeExisted <= 0 ? 0 : (totalPacketSize / ((double) profileTimeExisted / 1000D)); + + messages.add( + String.format("Network BandWidth Per Second: %s", + TextFormatting.GREEN + MiscUtils.formatNumber((long) networkBandwidthPerSec) + "B/s" + TextFormatting.WHITE) + ); + + if (limit <= 0) { + return messages; + } + + @SuppressWarnings("SimplifyStreamApiCallChains") + List, Tuple>> sorted = PacketProfiler.PACKET_TOTAL_SIZE.entrySet().stream() + .sorted((o1, o2) -> Long.compare(o2.getValue().getSecond(), o1.getValue().getSecond())) + .limit(limit) + .collect(Collectors.toList()); + + for (final Map.Entry, Tuple> entry : sorted) { + Class pClass = entry.getKey(); + long packetTotalAmount = entry.getValue().getFirst(); + long packetTotalSize = entry.getValue().getSecond(); + + if (pClass.isAssignableFrom(Packet.class)) { + messages.add( + String.format("Pkt Class: %s", + TextFormatting.BLUE + pClass.getSimpleName() + TextFormatting.WHITE + ) + ); + } else { + messages.add( + String.format("Mod Pkt Class: %s", + TextFormatting.BLUE + pClass.getName() + TextFormatting.WHITE + ) + ); + } + + messages.add( + String.format("Amt: %s, Size Total: %s, Size Avg: %s", + TextFormatting.GOLD + MiscUtils.formatDecimal(packetTotalAmount) + TextFormatting.WHITE, + TextFormatting.RED + MiscUtils.formatNumber(packetTotalSize) + 'B' + TextFormatting.WHITE, + TextFormatting.YELLOW + MiscUtils.formatNumber(packetTotalSize / packetTotalAmount)) + 'B' + TextFormatting.WHITE + ); + } + + return messages; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java b/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java new file mode 100644 index 0000000..8063b41 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/profiler/TEUpdatePacketProfiler.java @@ -0,0 +1,71 @@ +package github.kasuminova.stellarcore.client.profiler; + +import hellfirepvp.modularmachinery.common.util.MiscUtils; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Tuple; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.TextFormatting; + +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + +public class TEUpdatePacketProfiler { + public static final ConcurrentHashMap, Tuple> TE_UPDATE_PACKET_TOTAL_SIZE = new ConcurrentHashMap<>(); + + public static void onPacketReceived(SPacketUpdateTileEntity packet, int packetSize) { + WorldClient world = Minecraft.getMinecraft().world; + BlockPos pos = packet.getPos(); + if (world.isBlockLoaded(pos)) { + TileEntity te = world.getTileEntity(pos); + if (te == null) { + return; + } + + TE_UPDATE_PACKET_TOTAL_SIZE.compute(te.getClass(), (key, value) -> value == null + ? new Tuple<>(1L, (long) packetSize) + : new Tuple<>(value.getFirst() + 1, value.getSecond() + packetSize)); + } + } + + public static List getProfilerMessages(final int limit) { + if (limit <= 0) { + return Collections.emptyList(); + } + + List messages = new LinkedList<>(); + + @SuppressWarnings("SimplifyStreamApiCallChains") + List, Tuple>> teSorted = TEUpdatePacketProfiler.TE_UPDATE_PACKET_TOTAL_SIZE.entrySet().stream() + .sorted((o1, o2) -> Long.compare(o2.getValue().getSecond(), o1.getValue().getSecond())) + .limit(limit) + .collect(Collectors.toList()); + + messages.add("SPacketUpdateTileEntity stat:"); + for (final Map.Entry, Tuple> entry : teSorted) { + Class tClass = entry.getKey(); + long packetTotalAmount = entry.getValue().getFirst(); + long packetTotalSize = entry.getValue().getSecond(); + + messages.add( + String.format("TE Class: %s", + TextFormatting.BLUE + tClass.getName() + TextFormatting.WHITE) + ); + messages.add( + String.format("Amt: %s, Size Total: %s, Size Avg: %s", + TextFormatting.GOLD + MiscUtils.formatDecimal(packetTotalAmount) + TextFormatting.WHITE, + TextFormatting.RED + MiscUtils.formatNumber(packetTotalSize) + 'B' + TextFormatting.WHITE, + TextFormatting.YELLOW + MiscUtils.formatNumber(packetTotalSize / packetTotalAmount)) + 'B' + TextFormatting.WHITE + ); + } + + return messages; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java b/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java new file mode 100644 index 0000000..5ce4f65 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/client/util/RenderUtils.java @@ -0,0 +1,34 @@ +package github.kasuminova.stellarcore.client.util; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.shader.Framebuffer; +import org.lwjgl.opengl.GL11; + +public class RenderUtils { + + public static void renderFramebuffer(final Minecraft minecraft, final Framebuffer framebuffer) { + ScaledResolution res = new ScaledResolution(minecraft); + double scaledHeight = res.getScaledHeight_double(); + double scaledWidth = res.getScaledWidth_double(); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + framebuffer.bindFramebufferTexture(); + GlStateManager.enableTexture2D(); + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + buffer.pos(0, scaledHeight, 0.0).tex(0, 0).endVertex(); + buffer.pos(scaledWidth, scaledHeight, 0.0).tex(1, 0).endVertex(); + buffer.pos(scaledWidth, 0, 0.0).tex(1, 1).endVertex(); + buffer.pos(0, 0, 0.0).tex(0, 1).endVertex(); + tessellator.draw(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java b/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java new file mode 100644 index 0000000..b00cc6d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/CommonProxy.java @@ -0,0 +1,33 @@ +package github.kasuminova.stellarcore.common; + +import github.kasuminova.stellarcore.common.integration.fluxnetworks.IntegrationsFluxNetworks; +import net.minecraftforge.fml.common.Loader; + +@SuppressWarnings("MethodMayBeStatic") +public class CommonProxy { + + public CommonProxy() { + } + + public void construction() { + + } + + public void preInit() { + if (Loader.isModLoaded("fluxnetworks")) { + IntegrationsFluxNetworks.preInit(); + } + } + + public void init() { + + } + + public void postInit() { + + } + + public void loadComplete() { + + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java new file mode 100644 index 0000000..c6fdd2c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/FluxPlugAcceptor.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import mekanism.common.base.EnergyAcceptorWrapper; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.energy.CapabilityEnergy; +import sonar.fluxnetworks.common.tileentity.TileFluxPlug; + +public class FluxPlugAcceptor extends EnergyAcceptorWrapper.ForgeAcceptor { + + private final TileFluxPlug plug; + + public FluxPlugAcceptor(final TileFluxPlug plug, final EnumFacing side) { + super(plug.getCapability(CapabilityEnergy.ENERGY, side)); + this.plug = plug; + } + + @Override + public double acceptEnergy(final EnumFacing facing, final double amount, final boolean simulate) { + double maxCanReceive = Math.min(plug.getMaxTransferLimit() - plug.getTransferBuffer(), amount / 2.5D); + if (maxCanReceive >= Long.MAX_VALUE) { + maxCanReceive = Long.MAX_VALUE; + } + return plug.getTransferHandler().receiveFromSupplier((long) maxCanReceive, facing, simulate) * 2.5D; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java new file mode 100644 index 0000000..2b4690b --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/IntegrationsFluxNetworks.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import github.kasuminova.stellarcore.StellarCore; +import net.minecraftforge.fml.common.Loader; +import net.minecraftforge.fml.common.Optional; +import sonar.fluxnetworks.common.handler.TileEntityHandler; + +public class IntegrationsFluxNetworks { + + @Optional.Method(modid = "fluxnetworks") + public static void preInit() { + if (Loader.isModLoaded("mekanism")) { + initMekanismIntegration(); + } + } + + @Optional.Method(modid = "mekanism") + public static void initMekanismIntegration() { + //在列表头部插入适配器，保证不被其他类型覆盖结果。 + //Insert adapters in the head of the list to ensure that the results are not overwritten by other types. + TileEntityHandler.tileEnergyHandlers.add(0, MekanismEnergyHandler.INSTANCE); + StellarCore.log.info("Mekanism <===> FluxNetworks is initialized!"); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java new file mode 100644 index 0000000..612e52f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/integration/fluxnetworks/MekanismEnergyHandler.java @@ -0,0 +1,45 @@ +package github.kasuminova.stellarcore.common.integration.fluxnetworks; + +import mekanism.api.energy.IStrictEnergyAcceptor; +import mekanism.api.energy.IStrictEnergyOutputter; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import sonar.fluxnetworks.api.energy.ITileEnergyHandler; + +import javax.annotation.Nonnull; + +public class MekanismEnergyHandler implements ITileEnergyHandler { + + public static final MekanismEnergyHandler INSTANCE = new MekanismEnergyHandler(); + + @Override + public boolean hasCapability(@Nonnull final TileEntity te, final EnumFacing facing) { + return canAddEnergy(te, facing) || canRemoveEnergy(te, facing); + } + + @Override + public boolean canAddEnergy(@Nonnull final TileEntity te, final EnumFacing facing) { + return te instanceof IStrictEnergyAcceptor acceptor && acceptor.canReceiveEnergy(facing); + } + + @Override + public boolean canRemoveEnergy(@Nonnull final TileEntity te, final EnumFacing facing) { + return te instanceof IStrictEnergyOutputter outputter && outputter.canOutputEnergy(facing); + } + + @Override + public long addEnergy(final long amount, @Nonnull final TileEntity te, final EnumFacing facing, final boolean simulate) { + if (te instanceof IStrictEnergyAcceptor acceptor) { + return (long) Math.ceil(acceptor.acceptEnergy(facing, ((double) amount) * 2.5D, simulate) / 2.5D); + } + return 0; + } + + @Override + public long removeEnergy(final long amount, @Nonnull final TileEntity te, final EnumFacing facing) { + if (te instanceof IStrictEnergyOutputter outputter) { + return (long) Math.ceil(outputter.pullEnergy(facing, ((double) amount) * 2.5D, false) / 2.5D); + } + return 0; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java b/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java new file mode 100644 index 0000000..820bee6 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java @@ -0,0 +1,142 @@ +package github.kasuminova.stellarcore.common.util; + +import com.google.common.collect.Iterators; +import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; +import it.unimi.dsi.fastutil.longs.Long2ObjectMap; +import net.minecraft.util.math.BlockPos; + +import javax.annotation.Nonnull; +import java.util.*; +import java.util.stream.Collectors; + +public class BlockPos2ValueMap implements Map { + + protected final Long2ObjectMap internal = new Long2ObjectLinkedOpenHashMap<>(); + protected EntrySet entrySet = null; + + @Override + public int size() { + return internal.size(); + } + + @Override + public boolean isEmpty() { + return internal.isEmpty(); + } + + @Override + public boolean containsKey(final Object key) { + if (key instanceof BlockPos pos) { + return internal.containsKey(pos.toLong()); + } + return false; + } + + @Override + public boolean containsValue(final Object value) { + return internal.containsValue(value); + } + + @Override + public V get(final Object key) { + if (key instanceof BlockPos pos) { + return internal.get(pos.toLong()); + } + return null; + } + + @Override + public V put(final BlockPos key, final V value) { + return internal.put(key.toLong(), value); + } + + @Override + public V remove(final Object key) { + if (key instanceof BlockPos pos) { + return internal.remove(pos.toLong()); + } + return null; + } + + @Override + public void putAll(final Map map) { + map.forEach((k, v) -> internal.put(k.toLong(), v)); + } + + @Override + public void clear() { + internal.clear(); + } + + @Nonnull + @Override + public Set keySet() { + return internal.keySet().stream().map(BlockPos::fromLong).collect(Collectors.toSet()); + } + + @Nonnull + @Override + public Collection values() { + return internal.values(); + } + + @Nonnull + @Override + public Set> entrySet() { + return entrySet == null ? entrySet = new EntrySet() : entrySet; + } + + @Override + public boolean equals(final Object o) { + if (o instanceof BlockPos2ValueMap map) { + return internal.equals(map.internal); + } + return false; + } + + @Override + public int hashCode() { + return internal.hashCode(); + } + + public class EntrySet extends AbstractSet> { + @Override + public int size() { + return internal.size(); + } + + @Override + public void clear() { + internal.clear(); + } + + @Nonnull + @Override + public Iterator> iterator() { + return Iterators.transform(internal.long2ObjectEntrySet().iterator(), Entry::new); + } + } + + public static class Entry implements Map.Entry { + private final Long2ObjectMap.Entry parent; + + public Entry(Long2ObjectMap.Entry parent) { + this.parent = parent; + } + + @Override + public BlockPos getKey() { + return BlockPos.fromLong(parent.getLongKey()); + } + + @Override + public V getValue() { + return parent.getValue(); + } + + @Override + public V setValue(final V value) { + return parent.setValue(value); + } + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java b/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java new file mode 100644 index 0000000..bc323ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/HashedItemStack.java @@ -0,0 +1,41 @@ +package github.kasuminova.stellarcore.common.util; + +import com.github.bsideup.jabel.Desugar; +import net.minecraft.item.ItemStack; + +import java.util.Base64; +import java.util.Objects; + +@Desugar +public record HashedItemStack(ItemStack stack, int stackHashCode) { + public static HashedItemStack of(final ItemStack stack) { + ItemStack copied = stack.copy(); + return new HashedItemStack(copied, Objects.hash(copied.getItem().getRegistryName(), copied.getItemDamage(), copied.getTagCompound())); + } + + public static String stackToString(final ItemStack stack) { + String stackTagStr = null; + String registryName = Objects.requireNonNull(stack.getItem().getRegistryName()).toString(); + if (stack.getTagCompound() != null) { + stackTagStr = stack.getTagCompound().toString(); + } + return strToBase64(registryName) + "_" + stack.getItemDamage() + (stackTagStr == null ? "" : "_" + strToBase64(stackTagStr)); + } + + public static String strToBase64(final String str) { + return Base64.getEncoder().encodeToString(str.getBytes()); + } + + @Override + public boolean equals(final Object o) { + if (o instanceof HashedItemStack hashedItemStack) { + return ItemStack.areItemStacksEqual(stack, hashedItemStack.stack); + } + return false; + } + + @Override + public int hashCode() { + return stackHashCode; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java b/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java new file mode 100644 index 0000000..bfcc8ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/common/util/RandomUtils.java @@ -0,0 +1,14 @@ +package github.kasuminova.stellarcore.common.util; + +import java.util.concurrent.ThreadLocalRandom; + +public class RandomUtils { + + public static int nextInt(int bound) { + return ThreadLocalRandom.current().nextInt(bound); + } + + public static float nextFloat() { + return ThreadLocalRandom.current().nextFloat(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java new file mode 100644 index 0000000..3e5d9d0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreEarlyMixinLoader.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin; + +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; +import zone.rong.mixinbooter.IEarlyMixinLoader; + +import javax.annotation.Nullable; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +@SuppressWarnings("unused") +public class StellarCoreEarlyMixinLoader implements IFMLLoadingPlugin, IEarlyMixinLoader { + + @Override + public List getMixinConfigs() { + return Arrays.asList( + "mixins.jep.vanilla.json" + ); + } + + // Noop + + @Override + public String[] getASMTransformerClass() { + return new String[0]; + } + + @Override + public String getModContainerClass() { + return null; + } + + @Nullable + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(final Map data) { + + } + + @Override + public String getAccessTransformerClass() { + return null; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java new file mode 100644 index 0000000..3cba911 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/StellarCoreLateMixinLoader.java @@ -0,0 +1,84 @@ +package github.kasuminova.stellarcore.mixin; + +import net.minecraftforge.fml.common.Loader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import zone.rong.mixinbooter.ILateMixinLoader; + +import java.util.*; +import java.util.function.BooleanSupplier; + +@SuppressWarnings("unused") +public class StellarCoreLateMixinLoader implements ILateMixinLoader { + + public static final Logger LOG = LogManager.getLogger("STELLAR_CORE"); + public static final String LOG_PREFIX = "[STELLAR_CORE]" + ' '; + private static final Map MIXIN_CONFIGS = new LinkedHashMap<>(); + + static { + addModdedMixinCFG("mixins.stellar_core_ae.json", "appliedenergistics2"); + addModdedMixinCFG("mixins.stellar_core_armourers_workshop.json", "armourers_workshop"); + addModdedMixinCFG("mixins.stellar_core_astralsorcery.json", "astralsorcery"); + addModdedMixinCFG("mixins.stellar_core_athenaeum.json", "athenaeum"); + addModdedMixinCFG("mixins.stellar_core_avaritia.json", "avaritia"); + addModdedMixinCFG("mixins.stellar_core_betterchat.json", "betterchat"); + addModdedMixinCFG("mixins.stellar_core_biomesoplenty.json", "biomesoplenty"); + addModdedMixinCFG("mixins.stellar_core_bloodmagic.json", "bloodmagic"); + addModdedMixinCFG("mixins.stellar_core_botania.json", "botania"); + addModdedMixinCFG("mixins.stellar_core_cfm.json", "cfm"); + addModdedMixinCFG("mixins.stellar_core_chisel.json", "chisel"); + addModdedMixinCFG("mixins.stellar_core_eio.json", "enderio"); + addModdedMixinCFG("mixins.stellar_core_eio_conduit.json", "enderio", "enderioconduits"); + addModdedMixinCFG("mixins.stellar_core_extrabotany.json", "extrabotany"); + addModdedMixinCFG("mixins.stellar_core_fluxnetworks.json", "fluxnetworks"); + addModdedMixinCFG("mixins.stellar_core_ic2.json", "ic2"); + addModdedMixinCFG("mixins.stellar_core_igi.json", "ingameinfoxml"); + addModdedMixinCFG("mixins.stellar_core_immersiveengineering.json", "immersiveengineering"); + addModdedMixinCFG("mixins.stellar_core_legendarytooltips.json", "legendarytooltips"); + addModdedMixinCFG("mixins.stellar_core_mek_top.json", "mekanism", "theoneprobe"); + addModdedMixinCFG("mixins.stellar_core_mekanism.json", "mekanism"); + addModdedMixinCFG("mixins.stellar_core_mets.json", "mets"); + addModdedMixinCFG("mixins.stellar_core_nco.json", "nuclearcraft"); + addModdedMixinCFG("mixins.stellar_core_oreexcavation.json", "oreexcavation"); + addModdedMixinCFG("mixins.stellar_core_rgb_chat.json", "jianghun"); + addModdedMixinCFG("mixins.stellar_core_scalingguis.json", "scalingguis"); + addModdedMixinCFG("mixins.stellar_core_techguns.json", "techguns"); + addModdedMixinCFG("mixins.stellar_core_theoneprobe.json", "theoneprobe"); + addModdedMixinCFG("mixins.stellar_core_thermaldynamics.json", "thermaldynamics"); + } + + @Override + public List getMixinConfigs() { + return new ArrayList<>(MIXIN_CONFIGS.keySet()); + } + + @Override + public boolean shouldMixinConfigQueue(final String mixinConfig) { + BooleanSupplier supplier = MIXIN_CONFIGS.get(mixinConfig); + if (supplier == null) { + LOG.warn(LOG_PREFIX + "Mixin config {} is not found in config map! It will never be loaded.", mixinConfig); + return false; + } + return supplier.getAsBoolean(); + } + + private static boolean modLoaded(final String modID) { + return Loader.isModLoaded(modID); + } + + private static void addModdedMixinCFG(final String mixinConfig, final String modID) { + MIXIN_CONFIGS.put(mixinConfig, () -> modLoaded(modID)); + } + + private static void addModdedMixinCFG(final String mixinConfig, final String modID, final String... modIDs) { + MIXIN_CONFIGS.put(mixinConfig, () -> modLoaded(modID) && Arrays.stream(modIDs).allMatch(Loader::isModLoaded)); + } + + private static void addMixinCFG(final String mixinConfig) { + MIXIN_CONFIGS.put(mixinConfig, () -> true); + } + + private static void addMixinCFG(final String mixinConfig, final BooleanSupplier conditions) { + MIXIN_CONFIGS.put(mixinConfig, conditions); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java b/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java new file mode 100644 index 0000000..5ff4fa0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/appeng/MixinStackSizeRenderer.java @@ -0,0 +1,39 @@ +package github.kasuminova.stellarcore.mixin.appeng; + +import appeng.client.render.StackSizeRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +/** + * 优化当安装了 SmoothFont 时物品数量渲染字体过小的问题。 + */ +@Mixin(StackSizeRenderer.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinStackSizeRenderer { + + @ModifyConstant( + method = "renderStackSize", + constant = {@Constant(floatValue = 0.85F), @Constant(floatValue = 0.5F)}, + remap = false + ) + public float onRenderStackSize(final float ci) { + if (ci == 0.5F) { + return 0.7F; + } + return ci; + } + + @ModifyConstant( + method = "renderStackSize", + constant = {@Constant(intValue = 0), @Constant(intValue = -1)}, + remap = false + ) + public int onRenderStackSize(final int ci) { + if (ci == -1) { + return 0; + } + return ci; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java b/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java new file mode 100644 index 0000000..5317ab1 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/armourersworkshop/MixinSkinTexture.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.armourersworkshop; + +import moe.plushie.armourers_workshop.common.skin.data.SkinTexture; +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(SkinTexture.class) +public abstract class MixinSkinTexture { + + @Shadow(remap = false) protected abstract void deleteTexture(); + + @Shadow(remap = false) private int textureId; + + @Redirect(method = "finalize", + at = @At( + value = "INVOKE", + target = "Lmoe/plushie/armourers_workshop/common/skin/data/SkinTexture;deleteTexture()V", + remap = false), + remap = false) + private void onDeleteTexture(final SkinTexture instance) { + if (textureId != -1) { + Minecraft.getMinecraft().addScheduledTask(this::deleteTexture); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java new file mode 100644 index 0000000..1f2db8c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/AccessorResearchManager.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.data.research.PlayerProgress; +import hellfirepvp.astralsorcery.common.data.research.ResearchManager; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.UUID; + +@Mixin(ResearchManager.class) +public interface AccessorResearchManager { + + @Nonnull + @Accessor(remap = false) + @SuppressWarnings("DataFlowIssue") + static Map getPlayerProgressServer() { + return null; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java new file mode 100644 index 0000000..9fb1baa --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/InvokerPerkEffectHelper.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.constellation.perk.AbstractPerk; +import hellfirepvp.astralsorcery.common.constellation.perk.PerkEffectHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.relauncher.Side; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(PerkEffectHelper.class) +public interface InvokerPerkEffectHelper { + + @Invoker(remap = false) + void invokeHandlePerkModification(EntityPlayer player, Side side, boolean remove); + + @Invoker(remap = false) + void invokeHandlePerkRemoval(AbstractPerk perk, EntityPlayer player, Side side); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java new file mode 100644 index 0000000..0bf6739 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinKeyChainMining.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import hellfirepvp.astralsorcery.common.constellation.perk.tree.nodes.key.KeyChainMining; +import net.minecraftforge.event.world.BlockEvent; +import net.minecraftforge.fml.common.eventhandler.EventPriority; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(KeyChainMining.class) +public class MixinKeyChainMining { + + /** + * @author Kasumi_Nova + * @reason 配置文件不让禁用，那就把方法爆了。 + */ + @Overwrite(remap = false) + @SubscribeEvent(priority = EventPriority.LOW) + public void onBreak(BlockEvent.BreakEvent event) { + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java new file mode 100644 index 0000000..610998f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerAttributeMap.java @@ -0,0 +1,52 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import com.google.common.collect.Lists; +import hellfirepvp.astralsorcery.common.constellation.perk.PlayerAttributeMap; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Map; +import java.util.function.Function; + +@SuppressWarnings({"rawtypes", "unchecked", "MethodMayBeStatic"}) +@Mixin(PlayerAttributeMap.class) +public class MixinPlayerAttributeMap { + + @Redirect( + method = "applyModifier", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectApplyModifierComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + + @Redirect( + method = "removeModifier", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectRemoveModifierComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + + @Redirect( + method = "getModifiersByType", + at = @At( + value = "INVOKE", + target = "Ljava/util/Map;computeIfAbsent(Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object;", + remap = false + ), + remap = false) + public Object redirectGetModifiersByTypeComputeIfAbsent(final Map map, final Object key, final Function _f) { + return map.computeIfAbsent(key, t -> Lists.newCopyOnWriteArrayList()); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java new file mode 100644 index 0000000..77be825 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/astralsorcery/MixinPlayerProgress.java @@ -0,0 +1,89 @@ +package github.kasuminova.stellarcore.mixin.astralsorcery; + +import github.kasuminova.stellarcore.StellarCore; +import hellfirepvp.astralsorcery.common.constellation.perk.AbstractPerk; +import hellfirepvp.astralsorcery.common.constellation.perk.PerkEffectHelper; +import hellfirepvp.astralsorcery.common.data.research.PlayerProgress; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +/** + * 尝试兼容 PlayerDataSQL 的申必还原机制导致服务器崩溃的问题。 + */ +@Mixin(PlayerProgress.class) +public abstract class MixinPlayerProgress { + @Shadow(remap = false) public abstract Collection getAppliedPerks(); + + @Shadow(remap = false) public abstract List getSealedPerks(); + + @Inject(method = "load", at = @At("HEAD"), remap = false) + private void onLoadPre(final NBTTagCompound compound, final CallbackInfo ci) { + EntityPlayerMP player = stellarcore$getCurrentPlayer(); + if (player == null) { + return; + } + + StellarCore.log.info("Try to removing all perk data for player " + player.getGameProfile().getName() + "."); + try { + for (final AbstractPerk perk : getAppliedPerks()) { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkRemoval(perk, player, Side.SERVER); + } + for (final AbstractPerk perk : getSealedPerks()) { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkRemoval(perk, player, Side.SERVER); + } + } catch (Throwable e) { + StellarCore.log.warn("Remove failed!", e); + } + } + + @Inject(method = "load", at = @At("TAIL"), remap = false) + private void onLoadPost(final NBTTagCompound compound, final CallbackInfo ci) { + EntityPlayerMP player = stellarcore$getCurrentPlayer(); + if (player == null) { + return; + } + + StellarCore.log.info("Try to restoring new perk data for player " + player.getGameProfile().getName() + "."); + try { + ((InvokerPerkEffectHelper) PerkEffectHelper.EVENT_INSTANCE).invokeHandlePerkModification(player, Side.SERVER, false); + } catch (Throwable e) { + StellarCore.log.warn("Restore failed!", e); + } + } + + @Unique + @Nullable + private EntityPlayerMP stellarcore$getCurrentPlayer() { + if (FMLCommonHandler.instance().getSide().isClient()) { + return null; + } + Map playerProgress = AccessorResearchManager.getPlayerProgressServer(); + + UUID playerUUID = null; + for (final Map.Entry entry : playerProgress.entrySet()) { + if (entry.getValue() == (Object) this) { + playerUUID = entry.getKey(); + } + } + //noinspection ConstantValue + if (playerUUID == null) { + return null; + } + return FMLCommonHandler.instance().getMinecraftServerInstance().getPlayerList().getPlayerByUUID(playerUUID); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java new file mode 100644 index 0000000..59f54ff --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/athenaeum/MixinEnchantmentHelper.java @@ -0,0 +1,20 @@ +package github.kasuminova.stellarcore.mixin.athenaeum; + +import com.codetaylor.mc.athenaeum.util.EnchantmentHelper; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(EnchantmentHelper.class) +public class MixinEnchantmentHelper { + + /** + * 返回值绝对不可能小于 0，唯一的可能是数值溢出。 + * 修复玩家经验等级大于 15466 时经验溢出导致无法完成配方的问题。 + */ + @ModifyReturnValue(method = "getPlayerExperienceTotal", at = @At("RETURN"), remap = false) + private static int checkGetPlayerExperienceTotalRange(int value) { + return value < 0 ? Integer.MAX_VALUE : value; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java b/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java new file mode 100644 index 0000000..952a40c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/avaritia/MixinTileBase.java @@ -0,0 +1,20 @@ +package github.kasuminova.stellarcore.mixin.avaritia; + +import morph.avaritia.tile.TileBase; +import net.minecraft.tileentity.TileEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(TileBase.class) +public class MixinTileBase extends TileEntity { + + /** + * @author Kasumi_Nova + * @reason 移除不必要的同步。 + */ + @Overwrite + public void markDirty() { + super.markDirty(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java b/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java new file mode 100644 index 0000000..13d260a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/betterchat/MixinGuiBetterChat.java @@ -0,0 +1,87 @@ +package github.kasuminova.stellarcore.mixin.betterchat; + +import com.llamalad7.betterchat.gui.GuiBetterChat; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.ChatLine; +import net.minecraft.client.gui.GuiUtilRenderComponents; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + +/** + * 复制自 UniversalTweaks 的消息压缩，并兼容 BetterChat。 + */ +@Mixin(GuiBetterChat.class) +public abstract class MixinGuiBetterChat { + @Unique + private final Pattern universalTweaks$pattern = Pattern.compile("(?:§7)?\\s+\\[+\\d+]"); + + @Shadow(remap = false) @Final private List drawnChatLines = new ArrayList<>(); + + @Shadow(remap = false) @Final private List chatLines = new ArrayList<>(); + + @Shadow(remap = false) @Final private Minecraft mc; + + @Shadow + public abstract float getChatScale(); + + @Shadow + public abstract int getChatWidth(); + + @Inject(method = "setChatLine", at = @At("HEAD"), remap = false) + private void compactMessage(ITextComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci) { + int count = 1; + int chatSize = MathHelper.floor((float) this.getChatWidth() / this.getChatScale()); + List split = GuiUtilRenderComponents.splitText(chatComponent, chatSize, this.mc.fontRenderer, false, false); + ITextComponent textComponent = split.get(split.size() - 1); + for (int i = 0; i < drawnChatLines.size(); i++) { + ChatLine chatLine = drawnChatLines.get(i); + ITextComponent lineComponent = chatLine.getChatComponent(); + if (lineComponent.getFormattedText().trim().isEmpty()) { + continue; + } + if (!universalTweaks$isMessageEqual(lineComponent.createCopy(), textComponent.createCopy())) { + continue; + } + if (!lineComponent.getSiblings().isEmpty()) { + for (ITextComponent sibling : lineComponent.getSiblings()) { + if (universalTweaks$pattern.matcher(sibling.getUnformattedComponentText()).matches()) { + count += Integer.parseInt(sibling.getUnformattedComponentText().replaceAll("(?:§7)?\\D?", "")); + break; + } + } + } + this.drawnChatLines.removeIf(chatLine1 -> split.contains(chatLine1.getChatComponent()) || chatLine1.equals(chatLine)); + this.chatLines.removeIf(chatLine1 -> chatLine1.getChatComponent().getUnformattedComponentText().equals(chatComponent.getUnformattedComponentText())); + chatComponent.appendSibling(new TextComponentString(" [" + count + "]").setStyle(new Style().setColor(TextFormatting.GRAY))); + break; + } + } + + @Unique + private boolean universalTweaks$isMessageEqual(ITextComponent left, ITextComponent right) { + if (left.equals(right) || left.getUnformattedText().equals(right.getUnformattedText())) { + return true; + } + if (left.getSiblings().isEmpty()) { + return false; + } + + left.getSiblings().removeIf(sibling -> universalTweaks$pattern.matcher(sibling.getUnformattedComponentText()).matches()); + + return left.equals(right) || left.getUnformattedText().equals(right.getUnformattedText()); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java b/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java new file mode 100644 index 0000000..41b94d4 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/biomesoplenty/MixinBiomesOPlenty.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.biomesoplenty; + +import biomesoplenty.common.remote.TrailManager; +import biomesoplenty.core.BiomesOPlenty; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.concurrent.CompletableFuture; + + +@Mixin(BiomesOPlenty.class) +public class MixinBiomesOPlenty { + + /** + * 主线程执行网络操作，罪大恶极！ + */ + @Redirect(method = "preInit", + at = @At( + value = "INVOKE", + target = "Lbiomesoplenty/common/remote/TrailManager;retrieveTrails()V", + remap = false), + remap = false) + @SuppressWarnings("MethodMayBeStatic") + private void onPreInit() { + CompletableFuture.runAsync(TrailManager::retrieveTrails); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java b/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java new file mode 100644 index 0000000..d2947ef --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/bloodmagic/MixinBloodAltar.java @@ -0,0 +1,72 @@ +package github.kasuminova.stellarcore.mixin.bloodmagic; + +import WayofTime.bloodmagic.altar.BloodAltar; +import WayofTime.bloodmagic.tile.TileAltar; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(BloodAltar.class) +public class MixinBloodAltar { + + @Shadow(remap = false) private TileAltar tileAltar; + + private static void sendUpdatePacketToNearPlayers(final TileAltar altar, final World world, final BlockPos blockPos) { + MinecraftServer server = world.getMinecraftServer(); + if (server == null) { + return; + } + + server.addScheduledTask(() -> { + if (altar.isInvalid()) { + return; + } + for (EntityPlayerMP player : server.getPlayerList().getPlayers()) { + if (player.world != world) { + continue; + } + double distance = player.getPosition().getDistance(blockPos.getX(), blockPos.getY(), blockPos.getZ()); + if (distance <= 32) { + player.connection.sendPacket(altar.getUpdatePacket()); + } + } + }); + } + + @Redirect(method = "startCycle", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onStartCycleNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + + @Redirect(method = "update", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onUpdateNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + + @Redirect(method = "updateAltar", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;notifyBlockUpdate(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/block/state/IBlockState;I)V", + remap = true), + remap = false) + public void onUpdateAltarCycleNotifyUpdate(final World world, final BlockPos blockPos, final IBlockState pos, final IBlockState oldState, final int newState) { + sendUpdatePacketToNearPlayers(tileAltar, world, blockPos); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java new file mode 100644 index 0000000..560f210 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticAttachRecipe.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(CosmeticAttachRecipe.class) +public class MixinCosmeticAttachRecipe { + + @Inject(method = "matches", at = @At("HEAD"), cancellable = true) + private void removeMatches(final InventoryCrafting var1, final World var2, final CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } + + @Inject(method = "getCraftingResult", at = @At("HEAD"), cancellable = true) + private void removeGetCraftingResult(final InventoryCrafting var1, final CallbackInfoReturnable cir) { + cir.setReturnValue(ItemStack.EMPTY); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java new file mode 100644 index 0000000..1db4810 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinCosmeticRemoveRecipe.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(CosmeticRemoveRecipe.class) +public class MixinCosmeticRemoveRecipe { + + @Inject(method = "matches", at = @At("HEAD"), cancellable = true) + private void removeMatches(final InventoryCrafting var1, final World var2, final CallbackInfoReturnable cir) { + cir.setReturnValue(false); + } + + @Inject(method = "getCraftingResult", at = @At("HEAD"), cancellable = true) + private void removeGetCraftingResult(final InventoryCrafting var1, final CallbackInfoReturnable cir) { + cir.setReturnValue(ItemStack.EMPTY); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java new file mode 100644 index 0000000..9d50814 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/botania/MixinEntitySpark.java @@ -0,0 +1,53 @@ +package github.kasuminova.stellarcore.mixin.botania; + +import net.minecraft.entity.Entity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import vazkii.botania.api.mana.spark.ISparkAttachable; +import vazkii.botania.common.entity.EntitySpark; + +@Mixin(EntitySpark.class) +public abstract class MixinEntitySpark { + + @Unique private boolean stellarcore$receiveLeastOne = false; + @Unique private int stellarcore$failureCounter = 1; + + @Inject( + method = "onUpdate", + at = @At( + value = "INVOKE", + target = "Lvazkii/botania/common/entity/EntitySpark;getUpgrade()Lvazkii/botania/api/mana/spark/SparkUpgradeType;", + remap = false + ), + cancellable = true + ) + private void injectOnUpdatePre(final CallbackInfo ci) { + if (((Entity) (Object) this).world.getTotalWorldTime() % stellarcore$failureCounter != 0) { + ci.cancel(); + } + } + + @Redirect(method = "onUpdate", at = @At(value = "INVOKE", target = "Lvazkii/botania/api/mana/spark/ISparkAttachable;recieveMana(I)V", remap = false)) + private void redirectReceiveMana(final ISparkAttachable attachable, final int mana) { + attachable.recieveMana(mana); + if (mana != 0) { + stellarcore$receiveLeastOne = true; + } + } + + @Inject(method = "onUpdate", at = @At("TAIL")) + private void injectOnUpdateTail(final CallbackInfo ci) { + if (stellarcore$receiveLeastOne) { + if (stellarcore$failureCounter > 1) { + stellarcore$failureCounter--; + } + } else if (stellarcore$failureCounter < 10) { + stellarcore$failureCounter++; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java b/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java new file mode 100644 index 0000000..ef61be3 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/cfm/MixinImageCache.java @@ -0,0 +1,144 @@ +package github.kasuminova.stellarcore.mixin.cfm; + +import com.mrcrayfish.furniture.MrCrayfishFurnitureMod; +import com.mrcrayfish.furniture.client.ImageCache; +import com.mrcrayfish.furniture.client.Texture; +import net.minecraft.client.Minecraft; +import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.io.FileUtils; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import javax.annotation.Nullable; +import java.io.File; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Mixin(ImageCache.class) +public abstract class MixinImageCache { + + @Shadow(remap = false) + private Map cacheMap; + + @Shadow(remap = false) + public abstract File getCache(); + + @Inject(method = "", at = @At("TAIL"), remap = false) + public void overwriteInit(final CallbackInfo ci) { + cacheMap = new ConcurrentHashMap<>(); + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean loadCached(String url) { + if (cacheMap.containsKey(url)) { + return true; + } + + String id = DigestUtils.sha1Hex(url.getBytes()); + File file = new File(getCache(), id); + if (file.exists()) { + this.add(url, file); + return true; + } + return false; + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + @Nullable + public Texture get(String url) { + if (url == null) { + return null; + } + Texture texture = cacheMap.get(url); + if (texture != null) { + return texture; + } + synchronized (this) { + return cacheMap.get(url); + } + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public void add(String url, File file) { + if (cacheMap.containsKey(url)) { + return; + } + synchronized (this) { + if (!cacheMap.containsKey(url)) { + Texture texture = new Texture(file); + cacheMap.put(url, texture); + } + } + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean add(String url, byte[] data) { + if (cacheMap.containsKey(url)) { + return true; + } + + Texture texture; + String id = DigestUtils.sha1Hex(url.getBytes()); + File image = new File(getCache(), id); + + synchronized (this) { + if (cacheMap.containsKey(url)) { + return true; + } + cacheMap.put(url, texture = new Texture(image)); + } + + try { + FileUtils.writeByteArrayToFile(image, data); + } catch (IOException e) { + MrCrayfishFurnitureMod.logger().warn(e); + } + Minecraft.getMinecraft().addScheduledTask(texture::update); + return true; + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + private void tick() { + cacheMap.values().forEach(Texture::update); + } + + /** + * @author Kasumi_Nova + * @reason 这怎么写出来的死锁？ + */ + @Overwrite(remap = false) + public boolean isCached(String url) { + if (cacheMap.containsKey(url)) { + return true; + } + synchronized (this) { + return cacheMap.containsKey(url); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java b/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java new file mode 100644 index 0000000..50bd46e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/chisel/MixinTileAutoChisel.java @@ -0,0 +1,54 @@ +package github.kasuminova.stellarcore.mixin.chisel; + +import github.kasuminova.stellarcore.common.util.HashedItemStack; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import team.chisel.api.carving.ICarvingGroup; +import team.chisel.api.carving.ICarvingRegistry; +import team.chisel.common.block.TileAutoChisel; + +import java.util.Map; +import java.util.WeakHashMap; + +@Mixin(TileAutoChisel.class) +public class MixinTileAutoChisel { + + @Unique + private static final Map CACHED_CARVING_GROUP = new WeakHashMap<>(); + + @Unique + private long stellar_core$interval = 20; + + @ModifyConstant(method = "update", constant = @Constant(longValue = 20L)) + private long modifyUpdateInterval(long __) { + return stellar_core$interval; + } + + @Redirect( + method = "update", + at = @At( + value = "INVOKE", + target = "Lteam/chisel/api/carving/ICarvingRegistry;getGroup(Lnet/minecraft/item/ItemStack;)Lteam/chisel/api/carving/ICarvingGroup;", + remap = false + )) + @SuppressWarnings("MethodMayBeStatic") + private ICarvingGroup redirectGetGroup(final ICarvingRegistry instance, final ItemStack stack) { + return CACHED_CARVING_GROUP.computeIfAbsent(HashedItemStack.of(stack), _g -> instance.getGroup(stack)); + } + + @Inject(method = "mergeOutput", at = @At("HEAD"), remap = false) + private void injectMergeOutput(final ItemStack stack, final CallbackInfo ci) { + stellar_core$interval = Math.max(stellar_core$interval - 5, 20); + } + + @Inject(method = "setSourceSlot", at = @At("HEAD"), remap = false) + private void injectSetSourceSlot(final int slot, final CallbackInfo ci) { + if (slot == -1) { + stellar_core$interval = Math.min(stellar_core$interval + 5, 100); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java new file mode 100644 index 0000000..feaac15 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinItemTools.java @@ -0,0 +1,39 @@ +package github.kasuminova.stellarcore.mixin.eio; + +import crazypants.enderio.base.capability.ItemTools; +import net.minecraft.profiler.Profiler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(ItemTools.class) +public class MixinItemTools { + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;start(Lnet/minecraft/profiler/Profiler;Ljava/lang/String;Ljava/lang/Object;)V"), + remap = false + ) + private static void redirectProfStart(final Profiler profiler, final String section, final Object param) { + // noop + } + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;stop(Lnet/minecraft/profiler/Profiler;)V"), + remap = false + ) + private static void redirectProfStop(final Profiler profiler) { + // noop + } + + @Redirect( + method = "move(Lcrazypants/enderio/base/capability/ItemTools$Limit;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/tileentity/TileEntity;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Lcrazypants/enderio/base/capability/ItemTools$MoveResult;", + at = @At(value = "INVOKE", target = "Lcrazypants/enderio/base/diagnostics/Prof;stop(Lnet/minecraft/profiler/Profiler;I)V"), + remap = false + ) + private static void redirectProfStop(final Profiler i, final int profiler) { + // noop + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java new file mode 100644 index 0000000..8f63928 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eio/MixinTileEntityBase.java @@ -0,0 +1,24 @@ +package github.kasuminova.stellarcore.mixin.eio; + +import com.enderio.core.common.TileEntityBase; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityBase.class) +public class MixinTileEntityBase extends TileEntity { + + @Redirect( + method = "update", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/World;getTileEntity(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/tileentity/TileEntity;" + )) + private TileEntity redirectGetTileEntity(final World instance, final BlockPos blockPos) { + return this; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java new file mode 100644 index 0000000..36059b9 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/AccessorTarget.java @@ -0,0 +1,16 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(targets = "crazypants.enderio.conduits.conduit.item.NetworkedInventory$Target") +public interface AccessorTarget { + + @Accessor(remap = false) + boolean getStickyInput(); + + @Accessor(remap = false) + NetworkedInventory getInv(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java new file mode 100644 index 0000000..47bd3fc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/InvokerNetworkedInventory.java @@ -0,0 +1,17 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import net.minecraftforge.items.IItemHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(NetworkedInventory.class) +public interface InvokerNetworkedInventory { + + @Invoker(remap = false) + boolean callCanInsert(); + + @Invoker(remap = false) + IItemHandler callGetInventory(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java new file mode 100644 index 0000000..68e0e31 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinAbstractConduit.java @@ -0,0 +1,43 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.base.conduit.IConduitBundle; +import crazypants.enderio.conduits.conduit.AbstractConduit; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +import javax.annotation.Nonnull; + +@Mixin(AbstractConduit.class) +public abstract class MixinAbstractConduit { + + @Shadow(remap = false) protected abstract void updateNetwork(final World world); + + @Shadow(remap = false) protected abstract void updateConnections(); + + @Shadow(remap = false) protected boolean readFromNbt; + + @Shadow(remap = false)private boolean clientStateDirty; + + @Shadow(remap = false) @Nonnull public abstract IConduitBundle getBundle(); + + /** + * @author Kasumi_Nova + * @reason 移除 Profiler 部分。 + */ + @Overwrite(remap = false) + public void updateEntity(@Nonnull World world) { + if (world.isRemote) { + return; + } + updateNetwork(world); + updateConnections(); + readFromNbt = false; // the two update*()s react to this on their first run + if (clientStateDirty) { + getBundle().dirty(); + clientStateDirty = false; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java new file mode 100644 index 0000000..8d3e3b0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinItemConduit.java @@ -0,0 +1,63 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import com.enderio.core.common.util.NNList; +import crazypants.enderio.conduits.conduit.item.ItemConduit; +import github.kasuminova.stellarcore.mixin.util.CachedItemConduit; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ItemConduit.class) +public abstract class MixinItemConduit implements CachedItemConduit { + + @Unique + private ItemStack stellarcore$cachedStack = ItemStack.EMPTY; + + @Inject(method = "writeToNBT", at = @At("TAIL"), remap = false) + public void onWriteToNBT(final NBTTagCompound nbtRoot, final CallbackInfo ci) { + if (!stellarcore$cachedStack.isEmpty()) { + NBTTagCompound cachedStackTag = new NBTTagCompound(); + + stellarcore$cachedStack.writeToNBT(cachedStackTag); + if (stellarcore$cachedStack.getCount() > 64) { + cachedStackTag.setInteger("Count", stellarcore$cachedStack.getCount()); + } + + nbtRoot.setTag("cachedStack", cachedStackTag); + } + } + + @Inject(method = "readFromNBT", at = @At("TAIL"), remap = false) + public void onReadFromNBT(final NBTTagCompound nbtRoot, final CallbackInfo ci) { + if (nbtRoot.hasKey("cachedStack")) { + NBTTagCompound cachedStackTag = nbtRoot.getCompoundTag("cachedStack"); + stellarcore$cachedStack = new ItemStack(cachedStackTag); + stellarcore$cachedStack.setCount(cachedStackTag.getInteger("Count")); + } + } + + @Inject(method = "getDrops", at = @At("RETURN"), remap = false) + public void onGetDrops(final CallbackInfoReturnable> cir) { + if (!stellarcore$cachedStack.isEmpty()) { + cir.getReturnValue().add(stellarcore$cachedStack); + } + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public ItemStack getCachedStack() { + return stellarcore$cachedStack; + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public void setCachedStack(final ItemStack cachedStack) { + this.stellarcore$cachedStack = cachedStack; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java new file mode 100644 index 0000000..bdc647f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/eioconduit/MixinNetworkedInventory.java @@ -0,0 +1,189 @@ +package github.kasuminova.stellarcore.mixin.eioconduit; + +import crazypants.enderio.base.capability.ItemTools; +import crazypants.enderio.base.filter.item.IItemFilter; +import crazypants.enderio.conduits.conduit.item.IItemConduit; +import crazypants.enderio.conduits.conduit.item.NetworkedInventory; +import crazypants.enderio.util.Prep; +import github.kasuminova.stellarcore.mixin.util.CachedItemConduit; +import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +@Mixin(NetworkedInventory.class) +public abstract class MixinNetworkedInventory { + @Nonnull + @Shadow(remap = false) @Final private IItemConduit con; + + @SuppressWarnings({"StaticVariableMayNotBeInitialized", "NonConstantFieldWithUpperCaseName"}) + @Shadow(remap = false) @Final private static boolean EXECUTE; + + @Shadow(remap = false) + protected abstract int insertIntoTargets(@Nonnull final ItemStack toInsert); + + @Shadow(remap = false) + protected abstract void onItemExtracted(final int slot, final int numInserted); + + @Shadow(remap = false) + protected abstract Iterable getTargetIterator(); + + @Shadow(remap = false) + private static IItemFilter valid(final IItemFilter filter) { + return null; + } + + @Shadow(remap = false) + private static int positive(final int x) { + return 0; + } + + @Unique + private static int stellarcore$insertItemSimulate(NetworkedInventory targetInv, @Nonnull ItemStack item, IItemFilter filter) { + InvokerNetworkedInventory inv = (InvokerNetworkedInventory) targetInv; + if (!inv.callCanInsert() || Prep.isInvalid(item)) { + return 0; + } + final IItemHandler inventory = inv.callGetInventory(); + if (inventory == null) { + return 0; + } + if (filter == null) { + return stellarcore$simulateInsertItem(inventory, item); + } + if (filter.isLimited()) { + final int count = filter.getMaxCountThatPassesFilter(inventory, item); + if (count <= 0) { + return 0; + } + final int maxInsert = ItemTools.getInsertLimit(inventory, item, count); + if (maxInsert <= 0) { + return 0; + } + if (maxInsert < item.getCount()) { + item = item.copy(); + item.setCount(maxInsert); + } + } else if (!filter.doesItemPassFilter(inventory, item)) { + return 0; + } + return stellarcore$simulateInsertItem(inventory, item); + } + + @Unique + private static int stellarcore$simulateInsertItem(@Nullable IItemHandler inventory, @Nonnull ItemStack item) { + if (inventory == null || Prep.isInvalid(item)) { + return 0; + } + int startSize = item.getCount(); + ItemStack res = ItemTools.insertItemStacked(inventory, item.copy(), true); + return startSize - res.getCount(); + } + + @Inject(method = "doTransfer", at = @At("HEAD"), cancellable = true, remap = false) + public void doTransfer(final IItemHandler inventory, + final ItemStack extractedItem, + final int slot, + final CallbackInfoReturnable cir) { + if (!(con instanceof CachedItemConduit cachedItemConduit)) { + return; + } + if (!cachedItemConduit.getCachedStack().isEmpty()) { + cir.setReturnValue(false); + return; + } + int simulateInserted = stellarcore$insertIntoTargetsSimulate(extractedItem.copy()); + if (simulateInserted <= 0) { + cir.setReturnValue(false); + return; + } + + ItemStack extracted = inventory.extractItem(slot, simulateInserted, EXECUTE); + int inserted = insertIntoTargets(extracted.copy()); + int notInserted = extracted.getCount() - inserted; + + if (notInserted > 0) { + ItemStack notInsertedStack = extracted.copy(); + notInsertedStack.setCount(notInserted); + cachedItemConduit.setCachedStack(notInsertedStack); + } + + onItemExtracted(slot, inserted); + + cir.setReturnValue(inserted > 0); + } + + @Inject( + method = "transferItems", + at = @At( + value = "INVOKE", + target = "Lcrazypants/enderio/conduits/conduit/item/IItemConduit;getMaximumExtracted(Lnet/minecraft/util/EnumFacing;)I", + remap = false + ), + cancellable = true, + remap = false) + public void onTransferItems(final CallbackInfoReturnable cir) { + if (!(con instanceof CachedItemConduit cachedItemConduit)) { + return; + } + + ItemStack cachedStack = cachedItemConduit.getCachedStack(); + if (cachedStack.isEmpty()) { + return; + } + + int inserted = insertIntoTargets(cachedStack.copy()); + if (inserted == cachedStack.getCount()) { + cachedItemConduit.setCachedStack(ItemStack.EMPTY); + return; + } + if (inserted == 0) { + cir.setReturnValue(false); + return; + } + cachedStack.shrink(inserted); + } + + @Unique + private int stellarcore$insertIntoTargetsSimulate(@Nonnull ItemStack toInsert) { + if (Prep.isInvalid(toInsert)) { + return 0; + } + + final int totalToInsert = toInsert.getCount(); + // when true, a sticky filter has claimed this item and so only sticky outputs are allowed to handle it. sticky outputs are first in the target + // list, so all sticky outputs are queried before any non-sticky one. + boolean matchedStickyOutput = false; + + for (Object targetObj : getTargetIterator()) { + AccessorTarget target = (AccessorTarget) targetObj; + NetworkedInventory inv = target.getInv(); + final IItemFilter filter = valid(inv.getCon().getOutputFilter(inv.getConDir())); + if (target.getStickyInput() && !matchedStickyOutput && filter != null) { + matchedStickyOutput = filter.doesItemPassFilter(inv.getInventory(), toInsert); + } + if (target.getStickyInput() || !matchedStickyOutput) { + toInsert.shrink(positive(stellarcore$insertItemSimulate(inv, toInsert, filter))); + if (Prep.isInvalid(toInsert)) { + // everything has been inserted. we're done. + break; + } + continue; + } + if (!target.getStickyInput()) { + // item has been claimed by a sticky output but there are no sticky outputs left in targets, so we can stop checking + break; + } + } + + return totalToInsert - toInsert.getCount(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java b/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java new file mode 100644 index 0000000..44e128f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/extrabotany/MixinClientProxy.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.extrabotany; + +import com.google.common.util.concurrent.ListenableFuture; +import com.meteor.extrabotany.client.ClientProxy; +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.concurrent.CompletableFuture; + +@Mixin(ClientProxy.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinClientProxy { + + /** + * addScheduledTask 不代表异步。 + */ + @Redirect( + method = "preInit", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/Minecraft;addScheduledTask(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;", + remap = true + ), + remap = false) + private ListenableFuture redirectAddScheduledTask(final Minecraft instance, final Runnable runnableToSchedule) { + CompletableFuture.runAsync(runnableToSchedule); + // 返回 null，完全用不到。 + return null; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java b/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java new file mode 100644 index 0000000..a947302 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/fluxnetworks/MixinTOPIntegration.java @@ -0,0 +1,70 @@ +package github.kasuminova.stellarcore.mixin.fluxnetworks; + +import net.minecraft.util.text.TextFormatting; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; +import sonar.fluxnetworks.api.network.ConnectionType; +import sonar.fluxnetworks.api.translate.FluxTranslate; +import sonar.fluxnetworks.api.translate.Translation; +import sonar.fluxnetworks.api.utils.EnergyType; +import sonar.fluxnetworks.common.core.FluxUtils; +import sonar.fluxnetworks.common.integration.TOPIntegration; + +@Mixin(TOPIntegration.FluxConnectorInfoProvider.class) +public class MixinTOPIntegration { + + @SuppressWarnings("MethodMayBeStatic") + @Redirect(method = "addProbeInfo", + at = @At( + value = "INVOKE", + target = "Lsonar/fluxnetworks/api/translate/Translation;t()Ljava/lang/String;", + remap = false), + remap = false) + public String redirectAddProbeInfoTrans(final Translation instance) { + return stellar_core$getTOPTransKey(instance); + } + + @SuppressWarnings("MethodMayBeStatic") + @Redirect(method = "addProbeInfo", + at = @At( + value = "INVOKE", + target = "Lsonar/fluxnetworks/common/core/FluxUtils;getTransferInfo(Lsonar/fluxnetworks/api/network/ConnectionType;Lsonar/fluxnetworks/api/utils/EnergyType;J)Ljava/lang/String;", + remap = false), + remap = false) + public String redirectAddProbeInfoGetTransferInfo(final ConnectionType connectionType, final EnergyType energyType, final long change) { + return stellar_core$getTransferInfo(connectionType, energyType, change); + } + + @Unique + private static String stellar_core$getTransferInfo(ConnectionType type, EnergyType energyType, long change) { + if (type.isPlug()) { + String formatted = FluxUtils.format(change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + return change == 0L ? stellar_core$getTOPTransKey(FluxTranslate.INPUT) + ": " + TextFormatting.GOLD + formatted : stellar_core$getTOPTransKey(FluxTranslate.INPUT) + ": " + TextFormatting.GREEN + "+" + formatted; + } + if (!type.isPoint() && !type.isController()) { + if (type != ConnectionType.STORAGE) { + return ""; + } + if (change == 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.GOLD + change + energyType.getUsageSuffix(); + } + if (change > 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.RED + "-" + FluxUtils.format(change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + } + return stellar_core$getTOPTransKey(FluxTranslate.CHANGE) + ": " + TextFormatting.GREEN + "+" + FluxUtils.format(-change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + } + String formatted = FluxUtils.format(-change, FluxUtils.TypeNumberFormat.COMMAS, energyType, true); + if (change == 0L) { + return stellar_core$getTOPTransKey(FluxTranslate.OUTPUT) + ": " + TextFormatting.GOLD + formatted; + } + return stellar_core$getTOPTransKey(FluxTranslate.OUTPUT) + ": " + TextFormatting.RED + "-" + formatted; + } + + @Unique + private static String stellar_core$getTOPTransKey(Translation translation) { + return "{*" + translation.key + "*}"; + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java new file mode 100644 index 0000000..ad89642 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinEnergyCalculatorLeg.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.core.energy.grid.Grid; +import ic2.core.energy.grid.Node; +import ic2.core.energy.leg.EnergyCalculatorLeg; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collection; +import java.util.Collections; + +@Mixin(EnergyCalculatorLeg.class) +public class MixinEnergyCalculatorLeg { + + @Redirect( + method = "runCalculation", + at = @At( + value = "INVOKE", + target = "Lic2/core/energy/grid/Grid;getNodes()Ljava/util/Collection;", + remap = false), + remap = false + ) + private static Collection injectRunCalculation(final Grid instance) { + Collection nodes = instance.getNodes(); + if (nodes.size() <= 1) { + return Collections.emptyList(); + } + return nodes; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java new file mode 100644 index 0000000..7bb2638 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinGradualRecipe.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.core.recipe.GradualRecipe; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(GradualRecipe.class) +public class MixinGradualRecipe { + + @Redirect( + method = "getCraftingResult", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/item/ItemStack;copy()Lnet/minecraft/item/ItemStack;" + ) + ) + public ItemStack redirectItemStackCopy(final ItemStack instance) { + ItemStack copied = instance.copy(); + if (copied.getCount() > 1) { + copied.setCount(1); + } + return copied; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java new file mode 100644 index 0000000..101ce8a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinItemUpgradeModule.java @@ -0,0 +1,32 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import ic2.api.upgrade.IUpgradableBlock; +import ic2.core.item.upgrade.ItemUpgradeModule; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ItemUpgradeModule.class) +public class MixinItemUpgradeModule { + + @Inject( + method = "onTick", + at = @At( + value = "INVOKE", + target = "Lic2/core/util/StackUtil;getSize(Lnet/minecraft/item/ItemStack;)I", + remap = false), + remap = false, + cancellable = true + ) + private void injectOnTick(final ItemStack stack, final IUpgradableBlock parent, final CallbackInfoReturnable cir) { + TileEntity te = (TileEntity) parent; + if (te.getWorld().getTotalWorldTime() % 5 != 0) { + cir.setReturnValue(false); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java new file mode 100644 index 0000000..367857d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityMatter.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import github.kasuminova.stellarcore.mixin.util.ITaskExecutor; +import hellfirepvp.modularmachinery.ModularMachinery; +import ic2.core.block.machine.tileentity.TileEntityMatter; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityMatter.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinTileEntityMatter { + + @Redirect(method = "updateEntityServer", at = @At(value = "INVOKE", target = "Lic2/core/block/machine/tileentity/TileEntityMatter;markDirty()V")) + public void redirectMarkDirty(final TileEntityMatter instance) { + ((ITaskExecutor) ModularMachinery.EXECUTE_MANAGER).addTEMarkTask(instance); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java new file mode 100644 index 0000000..a56a3e5 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/ic2/MixinTileEntityReplicator.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.ic2; + +import github.kasuminova.stellarcore.mixin.util.ITaskExecutor; +import hellfirepvp.modularmachinery.ModularMachinery; +import ic2.core.block.machine.tileentity.TileEntityReplicator; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(TileEntityReplicator.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinTileEntityReplicator { + + @Redirect(method = "updateEntityServer", at = @At(value = "INVOKE", target = "Lic2/core/block/machine/tileentity/TileEntityReplicator;markDirty()V")) + public void redirectMarkDirty(final TileEntityReplicator instance) { + ((ITaskExecutor) ModularMachinery.EXECUTE_MANAGER).addTEMarkTask(instance); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java new file mode 100644 index 0000000..53458f9 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInGameInfoCore.java @@ -0,0 +1,113 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.InGameInfoCore; +import com.github.lunatrius.ingameinfo.client.gui.overlay.Info; +import github.kasuminova.stellarcore.client.util.RenderUtils; +import github.kasuminova.stellarcore.mixin.util.IMixinInGameInfoCore; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.shader.Framebuffer; +import org.lwjgl.opengl.GL11; +import org.spongepowered.asm.mixin.*; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.LinkedList; +import java.util.List; + +@Mixin(InGameInfoCore.class) +public class MixinInGameInfoCore implements IMixinInGameInfoCore { + + @Unique + private final List stellarcore$postDrawList = new LinkedList<>(); + + @Shadow(remap = false) @Final private List info; + @Unique + private Framebuffer stellarcore$fbo = null; + @Unique + private boolean stellarcore$refreshFBO = true; + @Unique + private boolean stellarcore$postDrawing = true; + + @Unique + private int stellarcore$tickCounter = 0; + @Unique + private int stellarcore$displayWidth = 0; + @Unique + private int stellarcore$displayHeight = 0; + + @Inject(method = "onTickClient", at = @At("HEAD"), remap = false) + private void onTickClient(final CallbackInfo ci) { + stellarcore$tickCounter++; + if (stellarcore$tickCounter % 2 == 0) { + stellarcore$refreshFBO = true; + } + } + + /** + * @author Kasumi_Nova + * @reason 使用 FBO 优化 IGI 渲染性能，帧率越高效果越好。 + */ + @Overwrite(remap = false) + public void onTickRender() { + if (!OpenGlHelper.framebufferSupported) { + return; + } + + Minecraft minecraft = Minecraft.getMinecraft(); + stellarcore$postDrawing = false; + + if (stellarcore$fbo == null) { + stellarcore$displayWidth = minecraft.displayWidth; + stellarcore$displayHeight = minecraft.displayHeight; + stellarcore$fbo = new Framebuffer(stellarcore$displayWidth, stellarcore$displayHeight, false); + stellarcore$fbo.framebufferColor[0] = 0.0F; + stellarcore$fbo.framebufferColor[1] = 0.0F; + stellarcore$fbo.framebufferColor[2] = 0.0F; + } + + if (stellarcore$refreshFBO) { + stellarcore$postDrawList.clear(); + stellar_core$renderToFBO(minecraft); + stellarcore$refreshFBO = false; + } + + RenderUtils.renderFramebuffer(minecraft, stellarcore$fbo); + stellarcore$postDrawing = true; + stellarcore$postDrawList.forEach(Runnable::run); + } + + @Unique + private void stellar_core$renderToFBO(final Minecraft minecraft) { + if (stellarcore$displayWidth != minecraft.displayWidth || stellarcore$displayHeight != minecraft.displayHeight) { + stellarcore$displayWidth = minecraft.displayWidth; + stellarcore$displayHeight = minecraft.displayHeight; + stellarcore$fbo.createBindFramebuffer(stellarcore$displayWidth, stellarcore$displayHeight); + } else { + stellarcore$fbo.framebufferClear(); + } + stellarcore$fbo.bindFramebuffer(false); + + GlStateManager.disableBlend(); + GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + info.forEach(Info::draw); + + Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public void addPostDrawAction(final Runnable action) { + stellarcore$postDrawList.add(action); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public boolean isPostDrawing() { + return stellarcore$postDrawing; + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java new file mode 100644 index 0000000..119b978 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinInfoItem.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.InGameInfoCore; +import com.github.lunatrius.ingameinfo.client.gui.overlay.InfoItem; +import github.kasuminova.stellarcore.mixin.util.IMixinInGameInfoCore; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(InfoItem.class) +public abstract class MixinInfoItem { + + @Shadow(remap = false) public abstract void drawInfo(); + + @Inject(method = "drawInfo", at = @At("HEAD"), cancellable = true, remap = false) + private void injectDrawInfo(final CallbackInfo ci) { + IMixinInGameInfoCore instance = (IMixinInGameInfoCore) InGameInfoCore.INSTANCE; + if (!instance.isPostDrawing()) { + instance.addPostDrawAction(this::drawInfo); + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java new file mode 100644 index 0000000..ff349af --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/igi/MixinPlayerHandler.java @@ -0,0 +1,18 @@ +package github.kasuminova.stellarcore.mixin.igi; + +import com.github.lunatrius.ingameinfo.handler.PlayerHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(PlayerHandler.class) +public class MixinPlayerHandler { + + @SuppressWarnings("MethodMayBeStatic") + @Inject(method = "onPlayerLogin", at = @At("HEAD"), cancellable = true, remap = false) + private void prevOnPlayerLogin(final CallbackInfo ci) { + ci.cancel(); + } + +} \ No newline at end of file diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java new file mode 100644 index 0000000..d46049a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIEMultiblock.java @@ -0,0 +1,33 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.blocks.BlockIEMultiblock; +import blusunrize.immersiveengineering.common.util.inventory.IIEInventory; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.Iterator; + +@Mixin(BlockIEMultiblock.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinBlockIEMultiblock { + + @Redirect( + method = "breakBlock", + at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", remap = false) + ) + @SuppressWarnings("rawtypes") + private boolean onBreakBlock(final Iterator instance, @Local(name = "master") IIEInventory master) { + if (instance.hasNext()) { + return true; + } + NonNullList inventory = master.getInventory(); + Collections.fill(inventory, ItemStack.EMPTY); + return false; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java new file mode 100644 index 0000000..b2e4ce7 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinBlockIETileProvider.java @@ -0,0 +1,37 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.blocks.BlockIETileProvider; +import blusunrize.immersiveengineering.common.util.inventory.IIEInventory; +import com.llamalad7.mixinextras.sugar.Local; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.Iterator; + +@Mixin(BlockIETileProvider.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinBlockIETileProvider { + + @Redirect( + method = "getDrops", + at = @At(value = "INVOKE", target = "Ljava/util/Iterator;hasNext()Z", remap = false), + remap = false + ) + @SuppressWarnings("rawtypes") + private boolean onGetDrops(final Iterator instance, @Local(name = "tile") TileEntity tile) { + if (instance.hasNext()) { + return true; + } + if (tile instanceof IIEInventory ieInv) { + NonNullList inventory = ieInv.getInventory(); + Collections.fill(inventory, ItemStack.EMPTY); + } + return false; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java new file mode 100644 index 0000000..3c59c00 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/immersiveengineering/MixinRecipeJerrycan.java @@ -0,0 +1,31 @@ +package github.kasuminova.stellarcore.mixin.immersiveengineering; + +import blusunrize.immersiveengineering.common.IEContent; +import blusunrize.immersiveengineering.common.crafting.RecipeJerrycan; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidUtil; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(RecipeJerrycan.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinRecipeJerrycan { + + @Redirect( + method = "getRelevantSlots", + at = @At( + value = "INVOKE", + target = "Lnet/minecraftforge/fluids/FluidUtil;getFluidHandler(Lnet/minecraft/item/ItemStack;)Lnet/minecraftforge/fluids/capability/IFluidHandlerItem;", + remap = false + ), + remap = false) + private IFluidHandlerItem redirectGetRelevantSlotsGetFluidHandler(final ItemStack itemStack) { + if (IEContent.itemJerrycan.equals(itemStack.getItem())) { + return null; + } + return FluidUtil.getFluidHandler(itemStack); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java b/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java new file mode 100644 index 0000000..0f21c24 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/legendarytooltips/MixinTooltipDecor.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.legendarytooltips; + +import com.anthonyhilyard.legendarytooltips.render.TooltipDecor; +import net.minecraft.client.gui.FontRenderer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Collections; +import java.util.List; + +@Mixin(TooltipDecor.class) +public class MixinTooltipDecor { + + /** + * 换行有问题捏。 + */ + @Redirect(method = "drawBorder", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/gui/FontRenderer;listFormattedStringToWidth(Ljava/lang/String;I)Ljava/util/List;", + remap = true + ), + remap = false) + private static List redirectDrawBorderListFormattedStringToWidth(final FontRenderer instance, final String str, final int wrapWidth) { + return Collections.singletonList(str); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java new file mode 100644 index 0000000..a342e53 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinEnergyAcceptorWrapper.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mek_top; + +import github.kasuminova.stellarcore.common.integration.fluxnetworks.FluxPlugAcceptor; +import mekanism.api.Coord4D; +import mekanism.common.base.EnergyAcceptorWrapper; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import sonar.fluxnetworks.common.tileentity.TileFluxPlug; + +@Mixin(EnergyAcceptorWrapper.class) +public class MixinEnergyAcceptorWrapper { + + @Inject(method = "get", at = @At("HEAD"), cancellable = true, remap = false) + private static void injectGet(final TileEntity te, final EnumFacing side, final CallbackInfoReturnable cir) { + //noinspection ConstantValue + if (te instanceof TileFluxPlug plug && te.getWorld() != null) { + FluxPlugAcceptor wrapper = new FluxPlugAcceptor(plug, side); + wrapper.coord = Coord4D.get(te); + cir.setReturnValue(wrapper); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java new file mode 100644 index 0000000..62bfed3 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mek_top/MixinIStrictEnergyStorage.java @@ -0,0 +1,35 @@ +package github.kasuminova.stellarcore.mixin.mek_top; + +import mcjty.lib.api.power.IBigPower; +import mekanism.api.energy.IStrictEnergyStorage; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(IStrictEnergyStorage.class) +public interface MixinIStrictEnergyStorage extends IBigPower { + + @Shadow(remap = false) double getEnergy(); + + @Shadow(remap = false) double getMaxEnergy(); + + @Unique + @Override + default long getStoredPower() { + double converted = getEnergy() / 2.5D; + if (converted >= Long.MAX_VALUE) { + return Long.MAX_VALUE; + } + return Math.round(converted); + } + + @Unique + @Override + default long getCapacity() { + double converted = getMaxEnergy() / 2.5D; + if (converted >= Long.MAX_VALUE) { + return Long.MAX_VALUE; + } + return Math.round(converted); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java b/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java new file mode 100644 index 0000000..f009244 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mekanism/MixinPipeUtils.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin.mekanism; + +import mekanism.common.base.target.FluidHandlerTarget; +import mekanism.common.util.CapabilityUtils; +import mekanism.common.util.EmitUtils; +import mekanism.common.util.PipeUtils; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import java.util.Collections; +import java.util.Set; + +@Mixin(PipeUtils.class) +public class MixinPipeUtils { + + /** + * @author Kasumi_Nova + * @reason 没有 HashSet 就没有伤害。 + */ + @Overwrite(remap = false) + public static int emit(Set sides, FluidStack stack, TileEntity from) { + if (stack == null || stack.amount == 0) { + return 0; + } + + FluidHandlerTarget target = new FluidHandlerTarget(stack); + EmitUtils.forEachSide(from.getWorld(), from.getPos(), sides, (acceptor, side) -> { + EnumFacing accessSide = side.getOpposite(); + CapabilityUtils.runIfCap(acceptor, CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, accessSide, (handler) -> { + if (PipeUtils.canFill(handler, stack)) { + target.addHandler(accessSide, handler); + } + }); + }); + + int curHandlers = target.getHandlers().size(); + if (curHandlers == 0) { + return 0; + } + + return EmitUtils.sendToAcceptors(Collections.singleton(target), curHandlers, stack.amount, stack); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java new file mode 100644 index 0000000..f463c42 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEnchantmentManager.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.manager.EnchantmentManager; +import net.minecraft.enchantment.Enchantment; +import net.minecraftforge.event.RegistryEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * 移除节能附魔，实际作用接近无。 + */ +@Mixin(EnchantmentManager.class) +public class MixinEnchantmentManager { + + @Inject(method = "onEnchantmentInit", at = @At("HEAD"), cancellable = true, remap = false) + private static void removeEnchantment(final RegistryEvent.Register event, final CallbackInfo ci) { + ci.cancel(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java new file mode 100644 index 0000000..4e717c0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinEntityTachyonBullet.java @@ -0,0 +1,35 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import github.kasuminova.stellarcore.mixin.util.EntityLivingBaseValues; +import net.lrsoft.mets.entity.EntityTachyonBullet; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.util.math.MathHelper; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(EntityTachyonBullet.class) +public class MixinEntityTachyonBullet { + + /** + * 杀杀杀杀杀 + */ + @Redirect( + method = "onUpdate", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/entity/EntityLivingBase;setHealth(F)V" + ) + ) + private void redirectSetHealth(final EntityLivingBase instance, final float health) { + DataParameter healthType = EntityLivingBaseValues.HEALTH; + if (healthType != null) { + instance.getDataManager().set(healthType, MathHelper.clamp(health, 0, instance.getMaxHealth())); + return; + } + instance.setHealth(health); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java new file mode 100644 index 0000000..591843a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinFirstAidLifeSupport.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricFirstAidLifeSupport; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricFirstAidLifeSupport.class) +public class MixinFirstAidLifeSupport { + + /** + * 电力生命维护仪。 + * （急救失败！） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java new file mode 100644 index 0000000..e57bb22 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinForceFieldGenerator.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricForceFieldGenerator; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricForceFieldGenerator.class) +public class MixinForceFieldGenerator { + + /** + * 电力伤害吸收仪 + * （虽然死灵护盾挺合理的，但是还是有点不太对劲...） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java new file mode 100644 index 0000000..3a4e126 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinLifeSupportRing.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.bauble.ElectricLifeSupportRing; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricLifeSupportRing.class) +public class MixinLifeSupportRing { + + /** + * 终极维生指环 + * （神已经跌落神坛了。） + */ + @Inject(method = "onWornTick", at = @At("HEAD"), cancellable = true, remap = false) + private void injectOnWorkTick(final ItemStack itemstack, final EntityLivingBase entity, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java new file mode 100644 index 0000000..6277af5 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/mets/MixinNutritionSupply.java @@ -0,0 +1,27 @@ +package github.kasuminova.stellarcore.mixin.mets; + +import net.lrsoft.mets.item.ElectricNutritionSupply; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(ElectricNutritionSupply.class) +public class MixinNutritionSupply { + + /** + * 电力营养供应器 + * （死因是撑死。） + */ + @Inject(method = "onUpdate", at = @At("HEAD"), cancellable = true) + private void injectOnWorkTick(final ItemStack stack, final World worldIn, final Entity entity, final int itemSlot, final boolean isSelected, final CallbackInfo ci) { + if (entity == null || !entity.isEntityAlive()) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java new file mode 100644 index 0000000..10ae0cc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinChunk.java @@ -0,0 +1,26 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.common.util.BlockPos2ValueMap; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.Chunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.Map; + +@Mixin(value = Chunk.class, priority = 1001) +public class MixinChunk { + + @Shadow @Final @Mutable private Map tileEntities; + + @Redirect(method = "(Lnet/minecraft/world/World;II)V", at = @At(value = "FIELD", target = "Lnet/minecraft/world/chunk/Chunk;tileEntities:Ljava/util/Map;")) + private void redirectNewHashMap(final Chunk instance, final Map value) { + this.tileEntities = new BlockPos2ValueMap<>(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java new file mode 100644 index 0000000..e0e8819 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinFontRenderer.java @@ -0,0 +1,48 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.util.ResourceLocation; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.awt.*; + +@Mixin(FontRenderer.class) +public class MixinFontRenderer { + + @Shadow @Final private int[] colorCode; + + @Inject(method = "", at = @At("TAIL")) + private void onInit(final GameSettings gameSettingsIn, final ResourceLocation location, final TextureManager textureManagerIn, final boolean unicode, final CallbackInfo ci) { + // 修改字体颜色喵 + colorCode[0] = 0x000000; + colorCode[1] = 0x1e90ff; + colorCode[2] = 0x00c853; + colorCode[3] = 0x4db6ac; + colorCode[4] = 0xd32f2f; + colorCode[5] = 0xe040fb; + colorCode[6] = 0xffa726; + colorCode[7] = 0xbdbdbd; + colorCode[8] = 0x546e7a; + colorCode[9] = 0x03a9f4; + colorCode[10] = 0x69f0ae; + colorCode[11] = 0x18ffff; + colorCode[12] = 0xff5e62; + colorCode[13] = 0xff80ab; + colorCode[14] = 0xffeb3b; + colorCode[15] = 0xffffff; + + for (int i = 0; i < 16; i++) { + Color color = new Color(colorCode[i]); + Color backgroundColor = new Color(color.getRed() / 4, color.getGreen() / 4, color.getBlue() / 4); + colorCode[i + 16] = backgroundColor.getRGB(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java new file mode 100644 index 0000000..89fafde --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyCompressionDecoder.java @@ -0,0 +1,42 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import io.netty.buffer.ByteBuf; +import net.minecraft.network.NettyCompressionDecoder; +import net.minecraft.network.PacketBuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@SuppressWarnings("MethodMayBeStatic") +@Mixin(NettyCompressionDecoder.class) +public class MixinNettyCompressionDecoder { + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readBytes(I)Lio/netty/buffer/ByteBuf;") + ) + private ByteBuf onDecodeLen(final PacketBuffer packetBuffer, final int len) { + final int prevIndex = packetBuffer.readerIndex(); + + ByteBuf decoded = packetBuffer.readBytes(len); + + PacketProfiler.onPacketDecoded(packetBuffer.readerIndex() - prevIndex); + return decoded; + } + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/PacketBuffer;readBytes([B)Lio/netty/buffer/ByteBuf;") + ) + private ByteBuf onDecodeByteArray(final PacketBuffer packetBuffer, final byte[] data) { + final int prevIndex = packetBuffer.readerIndex(); + + ByteBuf decoded = packetBuffer.readBytes(data); + + PacketProfiler.onPacketDecoded(packetBuffer.readerIndex() - prevIndex); + return decoded; + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java new file mode 100644 index 0000000..ef2daf1 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinNettyPacketDecoder.java @@ -0,0 +1,28 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import net.minecraft.network.NettyPacketDecoder; +import net.minecraft.network.Packet; +import net.minecraft.network.PacketBuffer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(NettyPacketDecoder.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinNettyPacketDecoder { + + @Redirect(method = "decode", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/network/Packet;readPacketData(Lnet/minecraft/network/PacketBuffer;)V") + ) + private void onDecode(final Packet packet, final PacketBuffer packetBuffer) throws Exception { + final int prevIndex = packetBuffer.readerIndex(); + + packet.readPacketData(packetBuffer); + + PacketProfiler.onPacketReceived(packet, packetBuffer.readerIndex() - prevIndex); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java new file mode 100644 index 0000000..db2a3cc --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinTessellator.java @@ -0,0 +1,43 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.vertex.VertexFormat; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import javax.annotation.Nonnull; + +@Mixin(Tessellator.class) +public class MixinTessellator { + + @Redirect(method = "", at = @At(value = "NEW", target = "(I)Lnet/minecraft/client/renderer/BufferBuilder;")) + private BufferBuilder redirectNewBuffer(final int bufferSizeIn) { + return new BufferBuilder(bufferSizeIn) { + + Thread thread = null; + + @Override + public void begin(final int glMode, @Nonnull final VertexFormat format) { + if (thread != null && thread != Thread.currentThread()) { + thread = null; + throw new IllegalStateException("Using Tessellator buffer in another thread."); + } + thread = Thread.currentThread(); + super.begin(glMode, format); + } + + @Override + public void finishDrawing() { + if (thread != null && thread != Thread.currentThread()) { + thread = null; + throw new IllegalStateException("Using Tessellator buffer in another thread."); + } + thread = null; + super.finishDrawing(); + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java new file mode 100644 index 0000000..895991a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/MixinWorld.java @@ -0,0 +1,41 @@ +package github.kasuminova.stellarcore.mixin.minecraft; + +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.world.World; +import net.minecraftforge.common.util.BlockSnapshot; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.ArrayList; +import java.util.LinkedList; + +@Mixin(World.class) +public class MixinWorld implements BlockSnapShotProvider { + + @Unique public LinkedList stellarcore$capturedBlockSnapshots = new LinkedList<>(); + + @SuppressWarnings("rawtypes") + @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z", + at = @At(value = "INVOKE", target = "Ljava/util/ArrayList;add(Ljava/lang/Object;)Z") + ) + public boolean onSetBlockStateAddSnapshot(final ArrayList instance, final Object e) { + return stellarcore$capturedBlockSnapshots.add((BlockSnapshot) e); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Z", + at = @At(value = "INVOKE", target = "Ljava/util/ArrayList;remove(Ljava/lang/Object;)Z") + ) + public boolean onSetBlockStateRemoveSnapshot(final ArrayList instance, final Object e) { + return stellarcore$capturedBlockSnapshots.remove((BlockSnapshot) e); + } + + @Override + @SuppressWarnings("AddedMixinMembersNamePattern") + public LinkedList getCapturedBlockSnapshots() { + return stellarcore$capturedBlockSnapshots; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java new file mode 100644 index 0000000..0bba771 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinForgeHooks.java @@ -0,0 +1,134 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import com.google.common.collect.Lists; +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBucket; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.stats.StatList; +import net.minecraft.util.EnumActionResult; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.util.BlockSnapshot; +import net.minecraftforge.event.ForgeEventFactory; +import net.minecraftforge.event.world.BlockEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import javax.annotation.Nonnull; +import java.util.List; + +@Mixin(ForgeHooks.class) +public class MixinForgeHooks { + + /** + * @author Kasumi_Nova + * @reason 重写获取的 capturedBlockSnapshots 捏，有一定危险性。 + */ + @Overwrite(remap = false) + @SuppressWarnings("unchecked") + public static EnumActionResult onPlaceItemIntoWorld(@Nonnull ItemStack itemstack, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ, @Nonnull EnumHand hand) { + // handle all placement events here + int meta = itemstack.getItemDamage(); + int size = itemstack.getCount(); + NBTTagCompound nbt = null; + if (itemstack.getTagCompound() != null) + { + nbt = itemstack.getTagCompound().copy(); + } + + if (!(itemstack.getItem() instanceof ItemBucket)) // if not bucket + { + world.captureBlockSnapshots = true; + } + + EnumActionResult ret = itemstack.getItem().onItemUse(player, world, pos, hand, side, hitX, hitY, hitZ); + world.captureBlockSnapshots = false; + + if (ret == EnumActionResult.SUCCESS) + { + // save new item data + int newMeta = itemstack.getItemDamage(); + int newSize = itemstack.getCount(); + NBTTagCompound newNBT = null; + if (itemstack.getTagCompound() != null) + { + newNBT = itemstack.getTagCompound().copy(); + } + BlockEvent.PlaceEvent placeEvent = null; + List blockSnapshots; + if (world instanceof BlockSnapShotProvider snapShotProvider) { + blockSnapshots = (List) snapShotProvider.getCapturedBlockSnapshots().clone(); + snapShotProvider.getCapturedBlockSnapshots().clear(); + } else { + blockSnapshots = (List) world.capturedBlockSnapshots.clone(); + world.capturedBlockSnapshots.clear(); + } + + // make sure to set pre-placement item data for event + itemstack.setItemDamage(meta); + itemstack.setCount(size); + if (nbt != null) + { + itemstack.setTagCompound(nbt); + } + if (blockSnapshots.size() > 1) + { + placeEvent = ForgeEventFactory.onPlayerMultiBlockPlace(player, blockSnapshots, side, hand); + } + else if (blockSnapshots.size() == 1) + { + placeEvent = ForgeEventFactory.onPlayerBlockPlace(player, blockSnapshots.get(0), side, hand); + } + + if (placeEvent != null && placeEvent.isCanceled()) + { + ret = EnumActionResult.FAIL; // cancel placement + // revert back all captured blocks + for (BlockSnapshot blocksnapshot : Lists.reverse(blockSnapshots)) + { + world.restoringBlockSnapshots = true; + blocksnapshot.restore(true, false); + world.restoringBlockSnapshots = false; + } + } + else + { + // Change the stack to its new content + itemstack.setItemDamage(newMeta); + itemstack.setCount(newSize); + if (nbt != null) + { + itemstack.setTagCompound(newNBT); + } + + for (BlockSnapshot snap : blockSnapshots) + { + int updateFlag = snap.getFlag(); + IBlockState oldBlock = snap.getReplacedBlock(); + IBlockState newBlock = world.getBlockState(snap.getPos()); + if (!newBlock.getBlock().hasTileEntity(newBlock)) // Containers get placed automatically + { + newBlock.getBlock().onBlockAdded(world, snap.getPos(), newBlock); + } + + world.markAndNotifyBlock(snap.getPos(), null, oldBlock, newBlock, updateFlag); + } + player.addStat(StatList.getObjectUseStats(itemstack.getItem())); + } + } + if (world instanceof BlockSnapShotProvider snapShotProvider) { + snapShotProvider.getCapturedBlockSnapshots().clear(); + } else { + world.capturedBlockSnapshots.clear(); + } + + return ret; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java new file mode 100644 index 0000000..4674385 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSimpleIndexedCodec.java @@ -0,0 +1,29 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import github.kasuminova.stellarcore.client.profiler.PacketProfiler; +import io.netty.buffer.ByteBuf; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.SimpleIndexedCodec; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(SimpleIndexedCodec.class) +public class MixinSimpleIndexedCodec { + + @Redirect(method = "decodeInto(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Lnet/minecraftforge/fml/common/network/simpleimpl/IMessage;)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraftforge/fml/common/network/simpleimpl/IMessage;fromBytes(Lio/netty/buffer/ByteBuf;)V", + remap = false), + remap = false + ) + private void onDecodePre(final IMessage message, final ByteBuf byteBuf) { + final int prevIndex = byteBuf.readerIndex(); + + message.fromBytes(byteBuf); + + PacketProfiler.onPacketReceived(message, byteBuf.readerIndex() - prevIndex); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java new file mode 100644 index 0000000..502836a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/minecraft/forge/MixinSplashProgress.java @@ -0,0 +1,22 @@ +package github.kasuminova.stellarcore.mixin.minecraft.forge; + +import github.kasuminova.stellarcore.mixin.util.CustomLoadingScreenUtils; +import net.minecraftforge.fml.client.SplashProgress; +import net.minecraftforge.fml.common.Loader; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + + +@Mixin(SplashProgress.class) +public class MixinSplashProgress { + + @Inject(method = "finish", at = @At("TAIL"), remap = false) + private static void injectFinish(final CallbackInfo ci) { + if (Loader.isModLoaded("customloadingscreen")) { + CustomLoadingScreenUtils.cleanCLSTextures(); + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java b/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java new file mode 100644 index 0000000..403f21c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/nco/MixinRadiationCapabilityHandler.java @@ -0,0 +1,34 @@ +package github.kasuminova.stellarcore.mixin.nco; + +import nc.capability.radiation.RadiationCapabilityHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * 禁用 Nuclearcraft Overhauled 的辐射能力系统。 + */ +@SuppressWarnings("MethodMayBeStatic") +@Mixin(RadiationCapabilityHandler.class) +public class MixinRadiationCapabilityHandler { + @Inject(method = "attachEntityRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachEntityRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachChunkRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachChunkRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachTileRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachTileRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } + + @Inject(method = "attachStackRadiationCapability", at = @At("HEAD"), cancellable = true, remap = false) + public void onAttachStackRadiationCapability(CallbackInfo ci) { + ci.cancel(); + } +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java b/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java new file mode 100644 index 0000000..725d6a0 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/oreexcavation/MixinMiningAgent.java @@ -0,0 +1,63 @@ +package github.kasuminova.stellarcore.mixin.oreexcavation; + +import github.kasuminova.stellarcore.mixin.util.BlockSnapShotProvider; +import net.minecraft.entity.player.EntityPlayerMP; +import oreexcavation.handlers.MiningAgent; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import java.util.ArrayList; + +@Mixin(MiningAgent.class) +public class MixinMiningAgent { + + @Shadow(remap = false) @Final public EntityPlayerMP player; + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;remove(I)Ljava/lang/Object;", + remap = false), + remap = false) + private Object onTickMinerRemoveSnapshots(final ArrayList instance, final int i) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().remove(i); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;size()I", + remap = false), + remap = false) + private int onTickMinerGetSnapshotsSize(final ArrayList instance) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().size(); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;get(I)Ljava/lang/Object;", + remap = false), + remap = false) + private Object onTickMinerGetSnapshot(final ArrayList instance, final int i) { + return ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().get(i); + } + + @SuppressWarnings("rawtypes") + @Redirect(method = "tickMiner", + at = @At( + value = "INVOKE", + target = "Ljava/util/ArrayList;clear()V", + remap = false), + remap = false) + private void onTickMinerClearSnapshots(final ArrayList instance) { + ((BlockSnapShotProvider) player.world).getCapturedBlockSnapshots().clear(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java new file mode 100644 index 0000000..dbef35c --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBChat.java @@ -0,0 +1,21 @@ +package github.kasuminova.stellarcore.mixin.rgbchat; + +import com.fred.jianghun.Main; +import github.kasuminova.stellarcore.client.gui.font.CachedRGBFontRenderer; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Main.class) +@SuppressWarnings("MethodMayBeStatic") +public class MixinRGBChat { + + @Inject(method = "postInit", at = @At("HEAD"), cancellable = true, remap = false) + public void onPostInit(final FMLPostInitializationEvent event, final CallbackInfo ci) { + CachedRGBFontRenderer.overrideFontRenderer(); + ci.cancel(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java new file mode 100644 index 0000000..f0388bd --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/rgbchat/MixinRGBSettings.java @@ -0,0 +1,16 @@ +package github.kasuminova.stellarcore.mixin.rgbchat; + +import com.fred.jianghun.truergb.IColor; +import com.fred.jianghun.truergb.RGBSettings; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +import java.util.List; + +@Mixin(RGBSettings.class) +public interface MixinRGBSettings { + + @Accessor(remap = false) + List getColors(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java new file mode 100644 index 0000000..4d5f32e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/scalingguis/MixinJsonHelper.java @@ -0,0 +1,47 @@ +package github.kasuminova.stellarcore.mixin.scalingguis; + +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; +import spazley.scalingguis.ScalingGUIs; +import spazley.scalingguis.config.JsonHelper; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +@Mixin(JsonHelper.class) +public class MixinJsonHelper { + + @Shadow(remap = false) private static Gson GSON; + + /** + * @author Kasumi_Nova + * @reason 在迭代器里面用 {@link List#remove(Object)} 是不行的捏。 + */ + @Overwrite(remap = false) + @SuppressWarnings("unchecked") + public static List getKeyList(JsonObject jsonObjectIn) { + Map map = (Map) GSON.fromJson(jsonObjectIn, LinkedHashMap.class); + List keyList = new ArrayList<>(map.keySet()); + keyList.removeIf(s -> !isClassExists(s)); + return keyList; + } + + @Unique + @SuppressWarnings("AddedMixinMembersNamePattern") + private static boolean isClassExists(final String className) { + try { + Class.forName(className); + return true; + } catch (Exception var6) { + ScalingGUIs.logger.error("Unknown class '" + className + "'. Removing from check list. Will be left in json assets.scalingguis.file.", var6); + return false; + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java new file mode 100644 index 0000000..91bbc0f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinAmmoSumRecipe.java @@ -0,0 +1,64 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import com.google.gson.JsonObject; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.JsonUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.crafting.JsonContext; +import net.minecraftforge.oredict.ShapedOreRecipe; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; +import techguns.items.guns.GenericGun; +import techguns.recipes.AmmoSumRecipeFactory; + +import javax.annotation.Nonnull; + +@Mixin(AmmoSumRecipeFactory.class) +public class MixinAmmoSumRecipe { + + @Shadow(remap = false) @Final protected static ResourceLocation GROUP; + + /** + * @author Kasumi_Nova + * @reason getCraftingResult mixin 不掉，那就只能 extend 一个了捏。 + */ + @Overwrite(remap = false) + public IRecipe parse(JsonContext context, JsonObject json) { + ShapedOreRecipe rec = ShapedOreRecipe.factory(context, json); + CraftingHelper.ShapedPrimer primer = new CraftingHelper.ShapedPrimer(); + primer.height = rec.getRecipeHeight(); + primer.width = rec.getRecipeWidth(); + primer.mirrored = JsonUtils.getBoolean(json, "mirrored", true); + primer.input = rec.getIngredients(); + + return new ShapedOreRecipe(GROUP, rec.getRecipeOutput(), primer) { + @Nonnull + @Override + public ItemStack getCraftingResult(@Nonnull final InventoryCrafting inv) { + int ammoSum = 0; + + for (int i = 0; i < inv.getSizeInventory(); ++i) { + if (!inv.getStackInSlot(i).isEmpty() && inv.getStackInSlot(i).getItem() instanceof final GenericGun g) { + ammoSum += g.getCurrentAmmo(inv.getStackInSlot(i)); + } + } + + ItemStack out = super.getCraftingResult(inv); + NBTTagCompound tags = out.getTagCompound(); + if (tags == null) { + tags = new NBTTagCompound(); + out.setTagCompound(tags); + } + tags.setShort("ammo", (short) ammoSum); + return out; + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java new file mode 100644 index 0000000..a21424a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGDamageSource.java @@ -0,0 +1,17 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import techguns.damagesystem.TGDamageSource; + +@Mixin(TGDamageSource.class) +public class MixinTGDamageSource { + + @Inject(method = "setBehaviourForVanilla", at = @At("HEAD"), remap = false) + private void onSetBehaviourForVanilla(final CallbackInfo ci) { + ((TGDamageSource) ((Object) this)).setProjectile(); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java new file mode 100644 index 0000000..5547bc7 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGExtendedPlayer.java @@ -0,0 +1,21 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import techguns.capabilities.TGExtendedPlayer; + +@Mixin(TGExtendedPlayer.class) +public class MixinTGExtendedPlayer { + + @Shadow(remap = false) public boolean enableSafemode; + + @Inject(method = "", at = @At("TAIL"), remap = false) + private void onInit(final EntityPlayer entity, final CallbackInfo ci) { + enableSafemode = true; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java new file mode 100644 index 0000000..0839604 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/techguns/MixinTGPermissions.java @@ -0,0 +1,18 @@ +package github.kasuminova.stellarcore.mixin.techguns; + +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import techguns.TGPermissions; + +@Mixin(TGPermissions.class) +public class MixinTGPermissions { + + @Inject(method = "isPlayerOp", at = @At("HEAD"), cancellable = true, remap = false) + private static void onIsPlayerOp(final EntityPlayer player, final CallbackInfoReturnable cir) { + cir.setReturnValue(player.canUseCommand(4, "")); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java b/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java new file mode 100644 index 0000000..3aa6b76 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/theoneprobe/MixinRenderHelper.java @@ -0,0 +1,64 @@ +package github.kasuminova.stellarcore.mixin.theoneprobe; + +import mcjty.theoneprobe.TheOneProbe; +import mcjty.theoneprobe.rendering.RenderHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(RenderHelper.class) +public class MixinRenderHelper { + + /** + * @author Kasumi_Nova + * @reason 防止渲染实体后头部乱动。 + */ + @Overwrite(remap = false) + public static void renderEntity(final Entity entity, final int xPos, final int yPos, final float scale) { + if (!(entity instanceof EntityPlayer)) { + return; + } + + GlStateManager.pushMatrix(); + GlStateManager.color(1.0F, 1.0F, 1.0F); + GlStateManager.enableRescaleNormal(); + GlStateManager.enableColorMaterial(); + GlStateManager.pushMatrix(); + GlStateManager.translate((float)(xPos + 8), (float)(yPos + 24), 50.0F); + GlStateManager.scale(-scale, scale, scale); + GlStateManager.rotate(180.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.rotate(135.0F, 0.0F, 1.0F, 0.0F); + net.minecraft.client.renderer.RenderHelper.enableStandardItemLighting(); + GlStateManager.rotate(-135.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(RenderHelper.rot, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(0.0F, 1.0F, 0.0F, 0.0F); + GlStateManager.translate(0.0F, (float) entity.getYOffset(), 0.0F); + Minecraft.getMinecraft().getRenderManager().playerViewY = 180.0F; + float prevPitch = entity.rotationPitch; + entity.rotationPitch = 0.0F; + + try { + Minecraft.getMinecraft().getRenderManager().renderEntity(entity, 0.0, 0.0, 0.0, 0.0F, 1.0F, false); + } catch (Exception var5) { + TheOneProbe.logger.error("Error rendering entity!", var5); + } + + entity.rotationPitch = prevPitch; + GlStateManager.popMatrix(); + net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting(); + GlStateManager.disableRescaleNormal(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.disableLighting(); + GlStateManager.popMatrix(); + GlStateManager.enableDepth(); + GlStateManager.disableColorMaterial(); + GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.disableTexture2D(); + GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java b/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java new file mode 100644 index 0000000..16c557e --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/thermaldynamics/MixinDuctUnitFluidSuper.java @@ -0,0 +1,52 @@ +package github.kasuminova.stellarcore.mixin.thermaldynamics; + +import cofh.thermaldynamics.duct.fluid.DuctUnitFluidSuper; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidTankProperties; +import net.minecraftforge.fluids.capability.templates.EmptyFluidHandler; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import javax.annotation.Nullable; + +@Mixin(DuctUnitFluidSuper.class) +public class MixinDuctUnitFluidSuper { + + @ModifyReturnValue(method = "getFluidCapability", at = @At("RETURN"), remap = false) + private IFluidHandler modifyFluidCapability(final IFluidHandler handler, final EnumFacing from) { + if (handler == EmptyFluidHandler.INSTANCE) { + return handler; + } + + DuctUnitFluidSuper duct = (DuctUnitFluidSuper) (Object) this; + //noinspection AnonymousInnerClassMayBeStatic + return new IFluidHandler() { + @Override + public IFluidTankProperties[] getTankProperties() { + return handler.getTankProperties(); + } + + @Override + public int fill(final FluidStack resource, final boolean doFill) { + return handler.fill(resource, doFill); + } + + @Nullable + @Override + public FluidStack drain(final FluidStack resource, final boolean doDrain) { + //noinspection DataFlowIssue + return duct.isOpen(from) ? duct.getGrid().myTank.drain(resource, doDrain) : null; + } + + @Nullable + @Override + public FluidStack drain(final int maxDrain, final boolean doDrain) { + return handler.drain(maxDrain, doDrain); + } + }; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java new file mode 100644 index 0000000..d94240a --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/BlockSnapShotProvider.java @@ -0,0 +1,11 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraftforge.common.util.BlockSnapshot; + +import java.util.LinkedList; + +public interface BlockSnapShotProvider { + + LinkedList getCapturedBlockSnapshots(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java new file mode 100644 index 0000000..a07a14d --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/CachedItemConduit.java @@ -0,0 +1,11 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraft.item.ItemStack; + +public interface CachedItemConduit { + + ItemStack getCachedStack(); + + void setCachedStack(final ItemStack cachedStack); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java new file mode 100644 index 0000000..dc1065f --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/CustomLoadingScreenUtils.java @@ -0,0 +1,19 @@ +package github.kasuminova.stellarcore.mixin.util; + +import alexiil.mc.mod.load.ClsManager; +import alexiil.mc.mod.load.render.MinecraftDisplayerRenderer; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.fml.common.Optional; + +public class CustomLoadingScreenUtils { + + @Optional.Method(modid = "customloadingscreen") + public static void cleanCLSTextures() { + try { + MinecraftDisplayerRenderer instance = ObfuscationReflectionHelper.getPrivateValue(ClsManager.class, null, "instance"); + ObfuscationReflectionHelper.setPrivateValue(MinecraftDisplayerRenderer.class, instance, null, "renderingParts"); + } catch (Exception ignored) { + } + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java new file mode 100644 index 0000000..5122bcb --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/EntityLivingBaseValues.java @@ -0,0 +1,25 @@ +package github.kasuminova.stellarcore.mixin.util; + +import github.kasuminova.stellarcore.StellarCore; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.network.datasync.DataParameter; + +import java.lang.reflect.Field; + +public class EntityLivingBaseValues { + + public static final DataParameter HEALTH; + + static { + DataParameter health = null; + try { + Field filedHealth = EntityLivingBase.class.getDeclaredField("HEALTH"); + filedHealth.setAccessible(true); + health = (DataParameter) filedHealth.get(null); + } catch (Exception e) { + StellarCore.log.warn("Cannot get field EntityLivingBase.HEALTH!", e); + } + HEALTH = health; + } + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java new file mode 100644 index 0000000..64c2907 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/IMixinInGameInfoCore.java @@ -0,0 +1,9 @@ +package github.kasuminova.stellarcore.mixin.util; + +public interface IMixinInGameInfoCore { + + void addPostDrawAction(Runnable action); + + boolean isPostDrawing(); + +} diff --git a/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java b/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java new file mode 100644 index 0000000..b8e5624 --- /dev/null +++ b/src/main/java/github/kasuminova/stellarcore/mixin/util/ITaskExecutor.java @@ -0,0 +1,9 @@ +package github.kasuminova.stellarcore.mixin.util; + +import net.minecraft.tileentity.TileEntity; + +public interface ITaskExecutor { + + void addTEMarkTask(final TileEntity te); + +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 0000000..aeddf58 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,23 @@ +{ + "modListVersion": 2, + "modList": [ + { + "modid": "stellar_core", + "name": "Stellar Core", + "description": "Stellar Core，An optimization mod.\n星核，一个普通的优化模组。", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "https://github.com/NovaEngineering-Source/StellarCore", + "updateUrl": "", + "authorList": [ + "Kasumi_Nova" + ], + "credits": "", + "logoFile": "", + "screenshots": [], + "dependencies": [], + "requiredMods": [], + "useDependencyInformation": true + } + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_ae.json b/src/main/resources/mixins.stellar_core_ae.json new file mode 100644 index 0000000..985cc8c --- /dev/null +++ b/src/main/resources/mixins.stellar_core_ae.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.appeng", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinStackSizeRenderer" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_armourers_workshop.json b/src/main/resources/mixins.stellar_core_armourers_workshop.json new file mode 100644 index 0000000..15f004e --- /dev/null +++ b/src/main/resources/mixins.stellar_core_armourers_workshop.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.armourersworkshop", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinSkinTexture" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_astralsorcery.json b/src/main/resources/mixins.stellar_core_astralsorcery.json new file mode 100644 index 0000000..5820c52 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_astralsorcery.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.astralsorcery", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "AccessorResearchManager", + "InvokerPerkEffectHelper", + "MixinKeyChainMining", + "MixinPlayerAttributeMap", + "MixinPlayerProgress" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_athenaeum.json b/src/main/resources/mixins.stellar_core_athenaeum.json new file mode 100644 index 0000000..260d585 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_athenaeum.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.athenaeum", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnchantmentHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_avaritia.json b/src/main/resources/mixins.stellar_core_avaritia.json new file mode 100644 index 0000000..53b1d29 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_avaritia.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.avaritia", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTileBase" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_betterchat.json b/src/main/resources/mixins.stellar_core_betterchat.json new file mode 100644 index 0000000..4b547f4 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_betterchat.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.betterchat", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinGuiBetterChat" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_biomesoplenty.json b/src/main/resources/mixins.stellar_core_biomesoplenty.json new file mode 100644 index 0000000..64c3f1f --- /dev/null +++ b/src/main/resources/mixins.stellar_core_biomesoplenty.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.biomesoplenty", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBiomesOPlenty" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_bloodmagic.json b/src/main/resources/mixins.stellar_core_bloodmagic.json new file mode 100644 index 0000000..62965a9 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_bloodmagic.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.bloodmagic", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBloodAltar" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_botania.json b/src/main/resources/mixins.stellar_core_botania.json new file mode 100644 index 0000000..bc6a128 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_botania.json @@ -0,0 +1,12 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.botania", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinCosmeticAttachRecipe", + "MixinCosmeticRemoveRecipe", + "MixinEntitySpark" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_cfm.json b/src/main/resources/mixins.stellar_core_cfm.json new file mode 100644 index 0000000..e483eaa --- /dev/null +++ b/src/main/resources/mixins.stellar_core_cfm.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.cfm", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinImageCache" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_chisel.json b/src/main/resources/mixins.stellar_core_chisel.json new file mode 100644 index 0000000..0efac01 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_chisel.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.chisel", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTileAutoChisel" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_eio.json b/src/main/resources/mixins.stellar_core_eio.json new file mode 100644 index 0000000..ad2d8be --- /dev/null +++ b/src/main/resources/mixins.stellar_core_eio.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.eio", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinItemTools", + "MixinTileEntityBase" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_eio_conduit.json b/src/main/resources/mixins.stellar_core_eio_conduit.json new file mode 100644 index 0000000..fdacb5b --- /dev/null +++ b/src/main/resources/mixins.stellar_core_eio_conduit.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.eioconduit", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "AccessorTarget", + "InvokerNetworkedInventory", + "MixinAbstractConduit", + "MixinItemConduit", + "MixinNetworkedInventory" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_extrabotany.json b/src/main/resources/mixins.stellar_core_extrabotany.json new file mode 100644 index 0000000..05613e9 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_extrabotany.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.extrabotany", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinClientProxy" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_fluxnetworks.json b/src/main/resources/mixins.stellar_core_fluxnetworks.json new file mode 100644 index 0000000..4539c14 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_fluxnetworks.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.fluxnetworks", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinTOPIntegration" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_ic2.json b/src/main/resources/mixins.stellar_core_ic2.json new file mode 100644 index 0000000..b5cff83 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_ic2.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.ic2", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnergyCalculatorLeg", + "MixinGradualRecipe", + "MixinItemUpgradeModule", + "MixinTileEntityMatter", + "MixinTileEntityReplicator" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_igi.json b/src/main/resources/mixins.stellar_core_igi.json new file mode 100644 index 0000000..4b20b46 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_igi.json @@ -0,0 +1,14 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.igi", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "server": [ + "MixinPlayerHandler" + ], + "client": [ + "MixinInfoItem", + "MixinInGameInfoCore" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_immersiveengineering.json b/src/main/resources/mixins.stellar_core_immersiveengineering.json new file mode 100644 index 0000000..13c4ecc --- /dev/null +++ b/src/main/resources/mixins.stellar_core_immersiveengineering.json @@ -0,0 +1,12 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.immersiveengineering", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinBlockIEMultiblock", + "MixinBlockIETileProvider", + "MixinRecipeJerrycan" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_legendarytooltips.json b/src/main/resources/mixins.stellar_core_legendarytooltips.json new file mode 100644 index 0000000..d6cfff2 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_legendarytooltips.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.legendarytooltips", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinTooltipDecor" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mek_top.json b/src/main/resources/mixins.stellar_core_mek_top.json new file mode 100644 index 0000000..f324292 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mek_top.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mek_top", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnergyAcceptorWrapper", + "MixinIStrictEnergyStorage" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mekanism.json b/src/main/resources/mixins.stellar_core_mekanism.json new file mode 100644 index 0000000..01f9f83 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mekanism.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mekanism", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinPipeUtils" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_mets.json b/src/main/resources/mixins.stellar_core_mets.json new file mode 100644 index 0000000..c2311ad --- /dev/null +++ b/src/main/resources/mixins.stellar_core_mets.json @@ -0,0 +1,15 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.mets", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinEnchantmentManager", + "MixinEntityTachyonBullet", + "MixinFirstAidLifeSupport", + "MixinForceFieldGenerator", + "MixinLifeSupportRing", + "MixinNutritionSupply" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_nco.json b/src/main/resources/mixins.stellar_core_nco.json new file mode 100644 index 0000000..1670507 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_nco.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.nco", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinRadiationCapabilityHandler" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_oreexcavation.json b/src/main/resources/mixins.stellar_core_oreexcavation.json new file mode 100644 index 0000000..75d71f0 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_oreexcavation.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.oreexcavation", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinMiningAgent" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_rgb_chat.json b/src/main/resources/mixins.stellar_core_rgb_chat.json new file mode 100644 index 0000000..0b28bc5 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_rgb_chat.json @@ -0,0 +1,11 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.rgbchat", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinRGBChat", + "MixinRGBSettings" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_scalingguis.json b/src/main/resources/mixins.stellar_core_scalingguis.json new file mode 100644 index 0000000..4ecf6ce --- /dev/null +++ b/src/main/resources/mixins.stellar_core_scalingguis.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.scalingguis", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinJsonHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_techguns.json b/src/main/resources/mixins.stellar_core_techguns.json new file mode 100644 index 0000000..6764878 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_techguns.json @@ -0,0 +1,13 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.techguns", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinAmmoSumRecipe", + "MixinTGDamageSource", + "MixinTGExtendedPlayer", + "MixinTGPermissions" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_theoneprobe.json b/src/main/resources/mixins.stellar_core_theoneprobe.json new file mode 100644 index 0000000..24300cc --- /dev/null +++ b/src/main/resources/mixins.stellar_core_theoneprobe.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.theoneprobe", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinRenderHelper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_thermaldynamics.json b/src/main/resources/mixins.stellar_core_thermaldynamics.json new file mode 100644 index 0000000..dec8517 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_thermaldynamics.json @@ -0,0 +1,10 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.thermaldynamics", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinDuctUnitFluidSuper" + ] +} \ No newline at end of file diff --git a/src/main/resources/mixins.stellar_core_vanilla.json b/src/main/resources/mixins.stellar_core_vanilla.json new file mode 100644 index 0000000..3343256 --- /dev/null +++ b/src/main/resources/mixins.stellar_core_vanilla.json @@ -0,0 +1,20 @@ +{ + "package": "github.kasuminova.stellarcore.mixin.minecraft", + "refmap": "mixins.stellar_core.refmap.json", + "target": "@env(DEFAULT)", + "minVersion": "0.8", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "MixinChunk", + "MixinWorld", + "forge.MixinForgeHooks" + ], + "client": [ + "MixinFontRenderer", + "MixinNettyCompressionDecoder", + "MixinNettyPacketDecoder", + "MixinTessellator", + "forge.MixinSimpleIndexedCodec", + "forge.MixinSplashProgress" + ] +} \ No newline at end of file