Compare commits

...
19 Commits
Author SHA1 Message Date
theOnly1iKnow 23e16abae6 Add handlers of Reikas mods plus fixes (#362)
* Added Handlers for some of Reikas mods aswell as:
 - a fix for the Industrialcraft Fluid/Solid Canning Machine
 - Tiling for all MFR machines with multiple recipes 
 - Added Cyanite Reporcessor from Big Reactors

* Bring metalformer in line with other IC2 machines
2023-03-20 08:30:15 -07:00
theOnly1iKnow b3cb4db9ca Added handlers for Factorization plus a missing MFR handler (#359)
* Added Handlers for Factorization
as well as a missing MFR Handler

* Added three more MFR handlers
2023-03-06 13:10:28 +01:00
Raven Szewczyk 45fea43a4b Fix MissingFileException in <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12791> (#360) 2023-03-05 14:11:45 +01:00
miozune 088d9c08a8 Prevent NPE with null value for keybind (#358) 2023-03-03 11:15:13 +01:00
miozune 98547c2bcf Prevent NPE with null overlayHandler (#357) 2023-03-03 11:14:56 +01:00
Raven Szewczyk 02fa633043 Fix mob spawn spots sometimes showing as gray (#355) 2023-03-01 13:39:08 +01:00
r1tsuu 9df6ab0232 MacOS Command key accessibility (#354)
* MacOS Command key accessibility

* MacOS Command key accessibility

* Fixed spotless violation build error

* Fixed RMENU key to RMETA as CTRL on MacOS
2023-02-28 15:53:59 +01:00
Raven Szewczyk 89cc203875 Light/chunk overlay fixes (#353)
* Update buildscript

* Fix mob/chunk overlay rendering at very far x/z coordinates

Closes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12680>

* Use Tesselator for mob spawn overlay drawing for a minor performance boost

* Missed a couple of offsets in the other chunk overlay modes
2023-02-27 13:31:44 +01:00
asdflj 4b247d08a5 add more api (#352) 2023-02-15 11:55:16 +01:00
Midnight145 8ecc8f20d5 add legacy handlers for botania,neiplugins (#349)
* add missing handlers for Blightfall

* update gitignore

* remove trailing commas

* add fluid registry handler

* readd missing quotes
2023-02-13 16:41:32 +00:00
miozune 74b9f8339a Require shift by default for moving items with overlaying recipe (#351) 2023-02-13 07:26:28 +01:00
miozune e20756a196 Don't require holding shift to move items when overlaying recipe (#348)
* updateBuildScript

* Remove redundant public modifier

* Don't require holding shift to move items when overlaying recipe
2023-02-09 11:21:30 +01:00
miozune 6d0f83c499 Make recipe query load all the uncrashed handlers instead of all-or-nothing if one of the handlers crashed (#347)
* Make recipe query load all the uncrashed handlers instead of all-or-nothing if one of the handlers crashed

* better error handling
2023-02-08 08:54:43 +01:00
miozune 8e219c06be Add JEI styled cycle ingredients (#346) 2023-02-05 16:57:09 +01:00
miozune 3fc576b6fc Add more error message for crash with recipe lookup (#345) 2023-02-05 11:27:52 +01:00
miozune 249cb2b308 Allow using hash for tooltip pagination keybind (#344) 2023-02-04 10:35:36 +01:00
miozune e8d8c1994b Add tooltip pagination (#343) 2023-02-03 15:35:03 +01:00
Raven Szewczyk 195b47944f There is no more 1.7.10- in the gha urls (#342) 2023-01-31 19:21:17 +01:00
Raven Szewczyk 3224fdef7d [ci skip] upgraded build system 2023-01-31 09:54:53 +00:00
24 changed files with 671 additions and 119 deletions

No files matched your search

+1
View File
@@ -27,3 +27,4 @@ whitelist.json
*.iws
src/main/resources/mixins.*.json
*.bat
.DS_Store
+296 -31
View File
@@ -1,4 +1,4 @@
//version: 1675074449
//version: 1678003329
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -9,13 +9,18 @@
import com.diffplug.blowdryer.Blowdryer
import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute
import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar
import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask
import com.matthewprenger.cursegradle.CurseArtifact
import com.matthewprenger.cursegradle.CurseRelation
import com.modrinth.minotaur.dependencies.ModDependency
import com.modrinth.minotaur.dependencies.VersionDependency
import cpw.mods.fml.relauncher.Side
import org.gradle.api.tasks.options.Option;
import org.gradle.internal.logging.text.StyledTextOutput.Style
import org.gradle.internal.logging.text.StyledTextOutputFactory
import org.gradle.internal.xml.XmlTransformer
import org.jetbrains.gradle.ext.*
import java.nio.file.Files
@@ -23,10 +28,10 @@ import java.nio.file.Paths
import java.util.concurrent.TimeUnit
import java.util.zip.ZipEntry
import java.util.zip.ZipOutputStream
import javax.inject.Inject
buildscript {
repositories {
mavenLocal()
mavenCentral()
maven {
@@ -47,6 +52,8 @@ buildscript {
name 'Scala CI dependencies'
url 'https://repo1.maven.org/maven2/'
}
mavenLocal()
}
}
plugins {
@@ -66,7 +73,7 @@ plugins {
id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.0.18'
id 'com.gtnewhorizons.retrofuturagradle' version '1.2.3'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
@@ -122,6 +129,9 @@ propertyDefaultIfUnset("gradleTokenGroupName", "")
propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only
propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only
// this is meant to be set using the user wide property file. by default we do nothing.
propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea"
project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts
if (!disableSpotless) {
apply plugin: 'com.diffplug.spotless'
@@ -143,7 +153,7 @@ java {
} else {
languageVersion.set(projectJavaVersion)
}
vendor.set(JvmVendorSpec.ADOPTIUM)
vendor.set(JvmVendorSpec.AZUL)
}
if (!noPublishedSources) {
withSourcesJar()
@@ -166,6 +176,9 @@ pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
"kaptMcLauncherKotlin",
"kaptPatchedMcKotlin",
"kaptInjectedTagsKotlin",
"kspMcLauncherKotlin",
"kspPatchedMcKotlin",
"kspInjectedTagsKotlin",
]
tasks.configureEach { task ->
if (task.name in disabledKotlinTaskList) {
@@ -183,11 +196,21 @@ configurations {
}
if (enableModernJavaSyntax.toBoolean()) {
repositories {
mavenCentral {
mavenContent {
includeGroup("me.eigenraven.java8unsupported")
}
}
}
dependencies {
annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0'
compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') {
transitive = false // We only care about the 1 annotation class
}
// Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937.
patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0')
}
tasks.withType(JavaCompile).configureEach {
@@ -199,7 +222,7 @@ if (enableModernJavaSyntax.toBoolean()) {
javaCompiler.set(javaToolchains.compilerFor {
languageVersion.set(JavaLanguageVersion.of(17))
vendor.set(JvmVendorSpec.ADOPTIUM)
vendor.set(JvmVendorSpec.AZUL)
})
}
}
@@ -231,12 +254,14 @@ if (apiPackage) {
}
if (accessTransformersFile) {
String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
for (atFile in accessTransformersFile.split(",")) {
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
}
tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
}
tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile)
tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile)
} else {
boolean atsFound = false
for (File at : sourceSets.getByName("main").resources.files) {
@@ -334,7 +359,7 @@ if (identifiedVersion == versionOverride) {
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
}
group = modGroup
group = "com.github.GTNewHorizons"
if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
archivesBaseName = customArchiveBaseName
} else {
@@ -364,6 +389,10 @@ minecraft {
injectMissingGenerics.set(true)
}
username = developmentEnvironmentUserName.toString()
lwjgl3Version = "3.3.2-SNAPSHOT"
// Enable assertions in the current mod
extraRunJvmArguments.add("-ea:${modGroup}")
@@ -398,6 +427,16 @@ configurations.configureEach {
}
}
}
def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE)
if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
// Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server
if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') {
details.useVersion '2388750'
details.because 'Pick obfuscated jar'
}
}
}
}
// Ensure tests have access to minecraft classes
@@ -427,8 +466,9 @@ repositories.configureEach { repo ->
apply from: 'repositories.gradle'
configurations {
runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) {
config.extendsFrom(runtimeOnlyNonPublishable)
if (usesShadowedDependencies.toBoolean()) {
config.extendsFrom(shadowImplementation)
// TODO: remove Compile after all uses are refactored to Implementation
@@ -481,6 +521,13 @@ repositories {
}
}
}
maven {
name 'sonatype'
url 'https://oss.sonatype.org/content/repositories/snapshots/'
content {
includeGroup "org.lwjgl"
}
}
if (includeWellKnownRepositories.toBoolean()) {
maven {
name "CurseMaven"
@@ -517,20 +564,20 @@ dependencies {
annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
annotationProcessor('com.google.guava:guava:24.1.1-jre')
annotationProcessor('com.google.code.gson:gson:2.8.6')
annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
if (usesMixinDebug.toBoolean()) {
runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
}
}
if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
implementation('com.gtnewhorizon:gtnhmixins:2.1.10')
implementation('com.gtnewhorizon:gtnhmixins:2.1.13')
}
}
pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
if (usesMixins.toBoolean()) {
dependencies {
kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
kapt('com.gtnewhorizon:gtnhmixins:2.1.13:processor')
}
}
}
@@ -630,9 +677,150 @@ tasks.named("processResources", ProcessResources).configure {
if (usesMixins.toBoolean()) {
from refMap
dependsOn("compileJava", "compileScala")
}
}
ext.java17Toolchain = (JavaToolchainSpec spec) -> {
spec.languageVersion.set(JavaLanguageVersion.of(17))
spec.vendor.set(JvmVendorSpec.matching("jetbrains"))
}
ext.java17DependenciesCfg = configurations.create("java17Dependencies") {
extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution
canBeConsumed = false
}
ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") {
canBeConsumed = false
}
dependencies {
def lwjgl3ifyVersion = '1.1.35'
def asmVersion = '9.4'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.40')
}
java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}")
java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
}
ext.java17JvmArgs = [
// Java 9+ support
"--illegal-access=warn",
"-Djava.security.manager=allow",
"-Dfile.encoding=UTF-8",
"--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED",
"--add-opens", "java.base/java.net=ALL-UNNAMED",
"--add-opens", "java.base/java.nio=ALL-UNNAMED",
"--add-opens", "java.base/java.io=ALL-UNNAMED",
"--add-opens", "java.base/java.lang=ALL-UNNAMED",
"--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED",
"--add-opens", "java.base/java.text=ALL-UNNAMED",
"--add-opens", "java.base/java.util=ALL-UNNAMED",
"--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED",
"--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming",
"--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED",
"--add-modules", "jdk.dynalink",
"--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED",
"--add-modules", "java.sql.rowset",
"--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED"
]
ext.hotswapJvmArgs = [
// DCEVM advanced hot reload
"-XX:+AllowEnhancedClassRedefinition",
"-XX:HotswapAgent=fatjar"
]
ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") {
group = "GTNH Buildscript"
description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory"
def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar'
def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")}
def targetFilename = "hotswap-agent.jar"
onlyIf {
!targetFolderProvider.get().file(targetFilename).asFile.exists()
}
doLast {
def targetFolder = targetFolderProvider.get()
targetFolder.asFile.mkdirs()
download.run {
src hsaUrl
dest targetFolder.file(targetFilename).asFile
overwrite false
tempAndMove true
}
}
}
public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask {
// IntelliJ doesn't seem to allow commandline arguments so we also support an env variable
private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP"));
@Input
public boolean getEnableHotswap() { return enableHotswap }
@Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger")
public boolean setEnableHotswap(boolean enable) { enableHotswap = enable }
@Inject
public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) {
super(side, gradle)
this.lwjglVersion = 3
this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain)
this.extraJvmArgs.addAll(project.java17JvmArgs)
this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : []))
this.classpath(project.java17PatchDependenciesCfg)
if (side == Side.CLIENT) {
this.classpath(project.minecraftTasks.lwjgl3Configuration)
}
// Use a raw provider instead of map to not create a dependency on the task
this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath))
this.classpath.filter { file ->
!file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2
}
this.classpath(project.java17DependenciesCfg)
if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) {
this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
}
}
}
def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient")
runClient17Task.configure {
setup(project)
group = "Modded Minecraft"
description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge"
dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
mainClass = "GradleStart"
username = minecraft.username
userUUID = minecraft.userUUID
}
def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer")
runServer17Task.configure {
setup(project)
group = "Modded Minecraft"
description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge"
dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar')
mainClass = "GradleStartServer"
extraArgs.add("nogui")
}
def getManifestAttributes() {
def manifestAttributes = [:]
if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
@@ -667,7 +855,7 @@ if (usesShadowedDependencies.toBoolean()) {
tasks.register('relocateShadowJar', ConfigureShadowRelocation) {
target = tasks.shadowJar
prefix = modGroup + ".shadow"
enabled = minimizeShadowedDependencies.toBoolean()
enabled = relocateShadowedDependencies.toBoolean()
}
tasks.named("shadowJar", ShadowJar).configure {
manifest {
@@ -683,7 +871,7 @@ if (usesShadowedDependencies.toBoolean()) {
project.configurations.shadeCompile
]
archiveClassifier.set('dev')
if (minimizeShadowedDependencies.toBoolean()) {
if (relocateShadowedDependencies.toBoolean()) {
dependsOn(relocateShadowJar)
}
}
@@ -702,7 +890,7 @@ if (usesShadowedDependencies.toBoolean()) {
javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) {
skip()
}
for (runTask in ["runClient", "runServer"]) {
for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) {
tasks.named(runTask).configure {
dependsOn("shadowJar")
}
@@ -711,16 +899,6 @@ if (usesShadowedDependencies.toBoolean()) {
ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
ext.publishableObfJar = tasks.reobfJar
tasks.named('extractForgeUserdev', Copy).configure { efu ->
doLast {
// Fix CoFH-repackaged CCL not finding mappings
project.copy {
from(mcpTasks.userdevDir("conf"))
into(new File(project.buildDir, "unpacked/conf"))
}
}
}
tasks.register('apiJar', Jar) {
from(sourceSets.main.allSource) {
include modGroupPath + "/" + apiPackagePath + '/**'
@@ -750,9 +928,23 @@ idea {
module {
downloadJavadoc = true
downloadSources = true
inheritOutputDirs = true
}
project {
settings {
if (ideaOverrideBuildType != "") {
delegateActions {
if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) {
delegateBuildRunToGradle = true
testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE
} else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) {
delegateBuildRunToGradle = false
testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
} else {
throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.')
}
}
}
runConfigurations {
"1. Run Client"(Gradle) {
taskNames = ["runClient"]
@@ -760,6 +952,20 @@ idea {
"2. Run Server"(Gradle) {
taskNames = ["runServer"]
}
"1a. Run Client (Java 17)"(Gradle) {
taskNames = ["runClient17"]
}
"2a. Run Server (Java 17)"(Gradle) {
taskNames = ["runServer17"]
}
"1b. Run Client (Java 17, Hotswap)"(Gradle) {
taskNames = ["runClient17"]
envs = ["HOTSWAP": "true"]
}
"2b. Run Server (Java 17, Hotswap)"(Gradle) {
taskNames = ["runServer17"]
envs = ["HOTSWAP": "true"]
}
"3. Run Obfuscated Client"(Gradle) {
taskNames = ["runObfClient"]
}
@@ -777,7 +983,7 @@ idea {
}
"Run Client (IJ Native)"(Application) {
mainClass = "GradleStart"
moduleName = project.name + ".main"
moduleName = project.name + ".ideVirtualMain"
afterEvaluate {
workingDirectory = tasks.runClient.workingDir.absolutePath
programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -788,7 +994,7 @@ idea {
}
"Run Server (IJ Native)"(Application) {
mainClass = "GradleStartServer"
moduleName = project.name + ".main"
moduleName = project.name + ".ideVirtualMain"
afterEvaluate {
workingDirectory = tasks.runServer.workingDir.absolutePath
programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ')
@@ -805,6 +1011,51 @@ idea {
]
}
}
withIDEADir { File ideaDir ->
if (!ideaDir.path.contains(".idea")) {
// If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory
ideaDir = new File(ideaDir, ".idea")
}
if (ideaDir.isDirectory()) {
def miscFile = new File(ideaDir, "misc.xml")
if (miscFile.isFile()) {
boolean dirty = false
def miscTransformer = new XmlTransformer()
miscTransformer.addAction { root ->
Node rootNode = root.asNode()
def rootManager = rootNode
.component.find { it.@name == 'ProjectRootManager' }
if (!rootManager) {
rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2'])
dirty = true
}
def output = rootManager.output
if (!output) {
output = rootManager.appendNode('output')
dirty = true
}
if (!output.@url) {
// Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow.
// This is a sensible default for most setups
output.@url = 'file://$PROJECT_DIR$/build/ideaBuild'
dirty = true
}
}
def result = miscTransformer.transform(miscFile.text)
if (dirty) {
miscFile.write(result)
}
} else {
miscFile.text = """<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2">
<output url="file://\$PROJECT_DIR\$/out" />
</component>
</project>
"""
}
}
}
}
}
}
@@ -825,7 +1076,7 @@ publishing {
artifact apiJar
}
groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
groupId = System.getenv("ARTIFACT_GROUP_ID") ?: project.group
artifactId = System.getenv("ARTIFACT_ID") ?: project.name
// Using the identified version, not project.version as it has the prepended 1.7.10
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
@@ -952,10 +1203,21 @@ def addCurseForgeRelation(String type, String name) {
}
// Updating
def buildscriptGradleVersion = "8.0.1"
tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
}
tasks.register('updateBuildScript') {
group = 'GTNH Buildscript'
description = 'Updates the build script to the latest version'
if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) {
dependsOn('wrapper')
}
doLast {
if (performBuildScriptUpdate()) return
@@ -968,6 +1230,9 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA
performBuildScriptUpdate()
} else {
out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
if (gradle.gradleVersion != buildscriptGradleVersion) {
out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n")
}
}
}
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Vendored
+2 -2
View File
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -221,6 +221,11 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
return true;
}
if (NEIClientConfig.isKeyHashDown("gui.next_tooltip")) {
GuiContainerManager.incrementTooltipPage();
return true;
}
if (isEnabled() && !isHidden()) {
for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar);
}
@@ -354,11 +359,18 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
this.icons[2] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 64, 0, 16, 16).build();
}
private boolean getIsAccessibleControlEventKey() {
if (Minecraft.isRunningOnMac) {
return Keyboard.getEventKey() == Keyboard.KEY_LMETA || Keyboard.getEventKey() == Keyboard.KEY_RMETA;
}
return Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
|| Keyboard.getEventKey() == Keyboard.KEY_RCONTROL;
}
@Override
public boolean onButtonPress(boolean rightclick) {
if (!rightclick) {
if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
|| Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) {
if (Keyboard.getEventKeyState() && getIsAccessibleControlEventKey()) {
NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
} else {
if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
@@ -267,6 +267,14 @@ public class NEIClientConfig {
.getBooleanValue(false);
API.addOption(new OptionToggleButton("inventory.optimize_gui_overlap_computation", true));
tag.getTag("inventory.jei_style_cycled_ingredients").setComment("JEI styled cycled ingredients")
.getBooleanValue(true);
API.addOption(new OptionToggleButton("inventory.jei_style_cycled_ingredients", true));
tag.getTag("inventory.shift_overlay_recipe")
.setComment("Require holding shift to move items when overlaying recipe").getBooleanValue(true);
API.addOption(new OptionToggleButton("inventory.shift_overlay_recipe", true));
tag.getTag("tools.handler_load_from_config").setComment("ADVANCED: Load handlers from config")
.getBooleanValue(false);
API.addOption(new OptionToggleButton("tools.handler_load_from_config", true) {
@@ -345,6 +353,7 @@ public class NEIClientConfig {
API.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
API.addKeyBind("gui.getprevioussearch", Keyboard.KEY_UP);
API.addKeyBind("gui.getnextsearch", Keyboard.KEY_DOWN);
API.addHashBind("gui.next_tooltip", Keyboard.KEY_Z);
API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
@@ -408,7 +417,7 @@ public class NEIClientConfig {
}
public static int getKeyBinding(String string) {
return getSetting("keys." + string).getIntValue();
return getSetting("keys." + string).getIntValue(Keyboard.KEY_NONE);
}
public static void setDefaultKeyBinding(String string, int key) {
@@ -420,6 +429,36 @@ public class NEIClientConfig {
return hash != Keyboard.CHAR_NONE && hash == NEIClientUtils.getKeyHash();
}
public static String getKeyName(int keyBind, boolean useHash) {
return getKeyName(keyBind, useHash, false);
}
public static String getKeyName(int keyBind, boolean useHash, boolean showOnlyHash) {
String keyText = "";
if (useHash) {
final String DELIMITER = " + ";
if ((keyBind & NEIClientUtils.CTRL_HASH) != 0) {
keyText += NEIClientUtils.translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl") + DELIMITER;
}
if ((keyBind & NEIClientUtils.SHIFT_HASH) != 0) {
keyText += "SHIFT" + DELIMITER;
}
if ((keyBind & NEIClientUtils.ALT_HASH) != 0) {
keyText += "ALT" + DELIMITER;
}
}
if (!showOnlyHash) {
keyText += Keyboard.getKeyName(unHashKey(keyBind));
}
return keyText;
}
public static int unHashKey(int keyBind) {
return keyBind & ~(NEIClientUtils.CTRL_HASH | NEIClientUtils.SHIFT_HASH | NEIClientUtils.ALT_HASH);
}
public static void bootNEI(World world) {
if (configLoaded) return;
@@ -539,6 +578,14 @@ public class NEIClientConfig {
return getBooleanSetting("inventory.optimize_gui_overlap_computation");
}
public static boolean useJEIStyledCycledIngredients() {
return getBooleanSetting("inventory.jei_style_cycled_ingredients");
}
public static boolean requireShiftForOverlayRecipe() {
return getBooleanSetting("inventory.shift_overlay_recipe");
}
public static boolean isEnabled() {
return enabledOverride && getBooleanSetting("inventory.widgetsenabled");
}
@@ -251,6 +251,9 @@ public class NEIClientUtils extends NEIServerUtils {
}
public static boolean controlKey() {
if (Minecraft.isRunningOnMac) {
return Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
}
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
}
@@ -22,6 +22,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -108,7 +109,11 @@ public class NEIServerConfig {
private static void saveWorld(int dim) {
try {
File file = new File(getSaveDir(DimensionManager.getWorld(dim)), "world.dat");
final File saveDir = getSaveDir(DimensionManager.getWorld(dim));
if (!saveDir.isDirectory()) {
FileUtils.forceMkdir(saveDir);
}
File file = new File(saveDir, "world.dat");
NEIServerUtils.writeNBT(dimTags.get(dim), file);
} catch (Exception e) {
throw new RuntimeException(e);
@@ -1,6 +1,7 @@
package codechicken.nei;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.passive.EntityPig;
@@ -14,7 +15,6 @@ import net.minecraft.world.chunk.Chunk;
import org.lwjgl.opengl.GL11;
import codechicken.lib.math.MathHelper;
import codechicken.lib.render.RenderUtils;
import codechicken.nei.KeyManager.IKeyStateTracker;
public class WorldOverlayRenderer implements IKeyStateTracker {
@@ -42,10 +42,19 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
public static void render(float frame) {
GL11.glPushMatrix();
Entity entity = Minecraft.getMinecraft().renderViewEntity;
RenderUtils.translateToWorldCoords(entity, frame);
renderChunkBounds(entity);
renderMobSpawnOverlay(entity);
double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame;
double interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * frame;
double interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * frame;
int intOffsetX = (int) interpPosX;
int intOffsetY = (int) interpPosY;
int intOffsetZ = (int) interpPosZ;
GL11.glTranslated(-interpPosX + intOffsetX, -interpPosY + intOffsetY, -interpPosZ + intOffsetZ);
renderChunkBounds(entity, intOffsetX, intOffsetY, intOffsetZ);
renderMobSpawnOverlay(entity, intOffsetX, intOffsetY, intOffsetZ);
GL11.glPopMatrix();
}
@@ -86,7 +95,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
}
}
private static void renderMobSpawnOverlay(Entity entity) {
private static void renderMobSpawnOverlay(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) {
if (mobOverlay == 0) {
if (mobSpawnCache != null) {
mobSpawnCache = null;
@@ -105,15 +114,17 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glLineWidth(1.5F);
GL11.glBegin(GL11.GL_LINES);
GL11.glColor4f(1, 0, 0, 1);
int curSpawnMode = 2;
World world = entity.worldObj;
int x1 = (int) entity.posX;
int z1 = (int) entity.posZ;
int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16);
int x1 = (int) entity.posX - intOffsetX;
int z1 = (int) entity.posZ - intOffsetZ;
int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16) - intOffsetY;
final Tessellator tess = Tessellator.instance;
tess.startDrawing(GL11.GL_LINES);
tess.setColorOpaque(255, 0, 0);
for (int i = 0; i <= 32; i++) {
int x = x1 - 16 + i;
@@ -132,22 +143,22 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
if (spawnMode != curSpawnMode) {
if (spawnMode == 1) {
GL11.glColor4f(1, 1, 0, 1);
tess.setColorOpaque(255, 255, 0);
} else {
GL11.glColor4f(1, 0, 0, 1);
tess.setColorOpaque(255, 0, 0);
}
curSpawnMode = spawnMode;
}
GL11.glVertex3d(x, y + 0.02, z);
GL11.glVertex3d(x + 1, y + 0.02, z + 1);
GL11.glVertex3d(x + 1, y + 0.02, z);
GL11.glVertex3d(x, y + 0.02, z + 1);
tess.addVertex(x, y + 0.02, z);
tess.addVertex(x + 1, y + 0.02, z + 1);
tess.addVertex(x + 1, y + 0.02, z);
tess.addVertex(x, y + 0.02, z + 1);
}
}
}
GL11.glEnd();
tess.draw();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_BLEND);
@@ -157,8 +168,8 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0);
private static byte getSpawnMode(Chunk chunk, int x, int y, int z) {
if (!SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)
|| chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8) {
if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8
|| !SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) {
return 0;
}
@@ -176,7 +187,7 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
return (byte) (chunk.getSavedLightValue(EnumSkyBlock.Sky, x & 15, y, z & 15) >= 8 ? 1 : 2);
}
private static void renderChunkBounds(Entity entity) {
private static void renderChunkBounds(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) {
if (chunkOverlay == 0) return;
GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -187,8 +198,8 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
GL11.glBegin(GL11.GL_LINES);
for (int cx = -4; cx <= 4; cx++) for (int cz = -4; cz <= 4; cz++) {
double x1 = (entity.chunkCoordX + cx) << 4;
double z1 = (entity.chunkCoordZ + cz) << 4;
double x1 = ((entity.chunkCoordX + cx) << 4) - intOffsetX;
double z1 = ((entity.chunkCoordZ + cz) << 4) - intOffsetZ;
double x2 = x1 + 16;
double z2 = z1 + 16;
@@ -205,6 +216,9 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
y1 = y2 - dy;
}
y1 -= intOffsetY;
y2 -= intOffsetY;
double dist = Math.pow(1.5, -(cx * cx + cz * cz));
GL11.glColor4d(0.9, 0, 0, dist);
@@ -240,6 +254,9 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
y1 = y2 - dy;
}
y1 -= intOffsetY;
y2 -= intOffsetY;
GL11.glColor4d(0, 0.9, 0, 0.4);
for (double y = (int) y1; y <= y2; y++) {
GL11.glVertex3d(x2, y, z1);
@@ -262,8 +279,10 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
GL11.glVertex3d(x2, y2, z1 + h);
}
} else if (chunkOverlay == 3) {
int gx1 = ((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4;
int gz1 = ((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4;
int gx1 = (((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4)
- intOffsetX;
int gz1 = (((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4)
- intOffsetZ;
if (entity.chunkCoordX < 0) {
gx1 += 16;
}
@@ -107,6 +107,14 @@ public class API {
RecipeInfo.registerOverlayHandler(classz, handler, ident);
}
/**
* @param classz The class of your gui
* @param ident The recipe identification string
*/
public static boolean hasGuiOverlayHandler(Class<? extends GuiContainer> classz, String ident) {
return RecipeInfo.hasOverlayHandler(classz, ident);
}
/**
* Set the offset to be added to items to translate them into recipe coords on the actual gui, default is 5, 11.
* Primarily RecipeTransferRects
@@ -6,5 +6,5 @@ import codechicken.nei.recipe.IRecipeHandler;
public interface IOverlayHandler {
public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift);
void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift);
}
@@ -5,11 +5,9 @@ import static codechicken.lib.gui.GuiDraw.drawStringC;
import java.awt.Rectangle;
import net.minecraft.client.Minecraft;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
public class OptionKeyBind extends OptionButton {
@@ -124,31 +122,8 @@ public class OptionKeyBind extends OptionButton {
@Override
public String getButtonText() {
String keyText = "";
if (useHash) {
final int metahash = Math.max(editing ? NEIClientUtils.getMetaHash() : getValue(), 0);
final String DELIMITER = EnumChatFormatting.GRAY + " + " + EnumChatFormatting.RESET;
if ((metahash & NEIClientUtils.CTRL_HASH) == NEIClientUtils.CTRL_HASH) {
keyText += NEIClientUtils.translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl") + DELIMITER;
}
if ((metahash & NEIClientUtils.SHIFT_HASH) == NEIClientUtils.SHIFT_HASH) {
keyText += "SHIFT" + DELIMITER;
}
if ((metahash & NEIClientUtils.ALT_HASH) == NEIClientUtils.ALT_HASH) {
keyText += "ALT" + DELIMITER;
}
}
if (!editing) {
keyText += Keyboard.getKeyName(
getValue() & ~(NEIClientUtils.CTRL_HASH | NEIClientUtils.SHIFT_HASH | NEIClientUtils.ALT_HASH));
}
return keyText;
final int metahash = Math.max(editing ? NEIClientUtils.getMetaHash() : getValue(), 0);
return NEIClientConfig.getKeyName(metahash, useHash, editing);
}
@Override
@@ -5,7 +5,7 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer;
import static codechicken.lib.gui.GuiDraw.getMousePosition;
import static codechicken.lib.gui.GuiDraw.renderEngine;
import java.awt.Point;
import java.awt.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -32,6 +32,7 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.recipe.StackInfo;
@@ -497,7 +498,49 @@ public class GuiContainerManager {
if (tooltip.size() > 0) tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE); // add space after 'title'
drawMultilineTip(font, mousex + 12, mousey - 12, tooltip);
drawPagedTooltip(font, mousex + 12, mousey - 12, tooltip);
}
private static int tooltipPage;
public static void drawPagedTooltip(FontRenderer font, int x, int y, List<String> list) {
if (list.isEmpty()) return;
List<List<String>> tooltips = splitTooltipByPage(list);
tooltipPage = tooltipPage < tooltips.size() ? tooltipPage : 0;
if (tooltips.size() > 1) {
tooltips.get(tooltipPage).add(
EnumChatFormatting.ITALIC + NEIClientUtils.translate(
"inventory.tooltip.page",
tooltipPage + 1,
tooltips.size(),
NEIClientConfig.getKeyName(NEIClientConfig.getKeyBinding("gui.next_tooltip"), true)));
}
drawMultilineTip(font, x, y, tooltips.get(tooltipPage));
}
public static List<List<String>> splitTooltipByPage(List<String> list) {
List<List<String>> ret = new ArrayList<>();
List<String> tmp = new ArrayList<>();
int height = -2;
for (int i = 0; i < list.size(); i++) {
String text = list.get(i);
GuiDraw.ITooltipLineHandler line = GuiDraw.getTipLine(text);
int lineHeight = line != null ? line.getSize().height
: text.endsWith(GuiDraw.TOOLTIP_LINESPACE) && i + 1 < list.size() ? 12 : 10;
if (height + lineHeight <= GuiDraw.displaySize().height - 8 * 2 - 10) {
// top & bottom 8px + last line for showing page
height += lineHeight;
} else {
ret.add(new ArrayList<>(tmp));
tmp.clear();
height = -2;
}
tmp.add(text);
}
if (!tmp.isEmpty()) {
ret.add(tmp);
}
return ret;
}
public static boolean shouldShowTooltip(GuiContainer window) {
@@ -516,6 +559,10 @@ public class GuiContainerManager {
}
}
public static void incrementTooltipPage() {
tooltipPage++;
}
public void renderSlotUnderlay(Slot slot) {
for (IContainerDrawHandler drawHandler : drawHandlers) drawHandler.renderSlotUnderlay(window, slot);
}
@@ -4,6 +4,7 @@ import static codechicken.lib.gui.GuiDraw.getMousePosition;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import net.minecraft.client.Minecraft;
@@ -38,7 +39,10 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
final RecipeHandlerQuery<ICraftingHandler> recipeQuery = new RecipeHandlerQuery<>(
h -> h.getRecipeHandler(outputId, results),
craftinghandlers,
serialCraftingHandlers);
serialCraftingHandlers,
"Error while looking up crafting recipe",
"outputId: " + outputId,
"results: " + Arrays.toString(results));
final ArrayList<ICraftingHandler> handlers = recipeQuery.runWithProfiling("recipe.concurrent.crafting");
@@ -471,6 +471,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
}
protected void overlayRecipe(int recipe, final boolean shift) {
boolean moveItems = shift || !NEIClientConfig.requireShiftForOverlayRecipe();
if (handler == null || !handler.hasOverlay(firstGui, firstGui.inventorySlots, recipe)) {
mc.displayGuiScreen(firstGui);
return;
@@ -479,8 +480,10 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
final IOverlayHandler overlayHandler = handler.getOverlayHandler(firstGui, recipe);
mc.displayGuiScreen(firstGui);
if (renderer == null || shift) {
overlayHandler.overlayRecipe(firstGui, currenthandlers.get(recipetype), recipe, shift);
if (renderer == null || moveItems) {
if (overlayHandler != null) {
overlayHandler.overlayRecipe(firstGui, currenthandlers.get(recipetype), recipe, moveItems);
}
} else {
LayoutManager.overlayRenderer = renderer;
}
@@ -1,6 +1,7 @@
package codechicken.nei.recipe;
import java.util.ArrayList;
import java.util.Arrays;
import net.minecraft.client.Minecraft;
@@ -16,7 +17,10 @@ public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
RecipeHandlerQuery<IUsageHandler> recipeQuery = new RecipeHandlerQuery<>(
h -> getUsageOrCatalystHandler(h, inputId, ingredients),
usagehandlers,
serialUsageHandlers);
serialUsageHandlers,
"Error while looking up usage recipe",
"inputId: " + inputId,
"ingredients: " + Arrays.toString(ingredients));
ArrayList<IUsageHandler> handlers = recipeQuery.runWithProfiling("recipe.concurrent.usage");
if (handlers.isEmpty()) return false;
@@ -21,20 +21,29 @@ class RecipeHandlerQuery<T extends IRecipeHandler> {
private final Function<T, T> recipeHandlerFunction;
private final List<T> recipeHandlers;
private final List<T> serialRecipeHandlers;
private final String[] errorMessage;
private boolean error = false;
RecipeHandlerQuery(Function<T, T> recipeHandlerFunction, List<T> recipeHandlers, List<T> serialRecipeHandlers) {
RecipeHandlerQuery(Function<T, T> recipeHandlerFunction, List<T> recipeHandlers, List<T> serialRecipeHandlers,
String... errorMessage) {
this.recipeHandlerFunction = recipeHandlerFunction;
this.recipeHandlers = recipeHandlers;
this.serialRecipeHandlers = serialRecipeHandlers;
this.errorMessage = errorMessage;
}
ArrayList<T> runWithProfiling(String profilerSection) {
TaskProfiler profiler = ProfilerRecipeHandler.getProfiler();
profiler.start(profilerSection);
try {
return getRecipeHandlersParallel();
ArrayList<T> handlers = getRecipeHandlersParallel();
if (error) {
displayRecipeLookupError();
}
return handlers;
} catch (InterruptedException | ExecutionException e) {
displayRecipeLookupError(e);
printLog(e);
displayRecipeLookupError();
return new ArrayList<>(0);
} finally {
profiler.end();
@@ -51,19 +60,37 @@ class RecipeHandlerQuery<T extends IRecipeHandler> {
}
private ArrayList<T> getSerialHandlersWithRecipes() {
return serialRecipeHandlers.stream().map(recipeHandlerFunction).filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new));
return serialRecipeHandlers.stream().map(handler -> {
try {
return recipeHandlerFunction.apply(handler);
} catch (Throwable t) {
printLog(t);
error = true;
return null;
}
}).filter(h -> h != null && h.numRecipes() > 0).collect(Collectors.toCollection(ArrayList::new));
}
private ArrayList<T> getHandlersWithRecipes() throws InterruptedException, ExecutionException {
return ItemList.forkJoinPool.submit(
() -> recipeHandlers.parallelStream().map(recipeHandlerFunction).filter(h -> h.numRecipes() > 0)
.collect(Collectors.toCollection(ArrayList::new)))
.get();
return ItemList.forkJoinPool.submit(() -> recipeHandlers.parallelStream().map(handler -> {
try {
return recipeHandlerFunction.apply(handler);
} catch (Throwable t) {
printLog(t);
error = true;
return null;
}
}).filter(h -> h != null && h.numRecipes() > 0).collect(Collectors.toCollection(ArrayList::new))).get();
}
private static void displayRecipeLookupError(Exception e) {
e.printStackTrace();
private void printLog(Throwable t) {
for (String message : errorMessage) {
NEIClientConfig.logger.error(message);
}
t.printStackTrace();
}
private void displayRecipeLookupError() {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player != null) {
IChatComponent chat = new ChatComponentTranslation("nei.chat.recipe.error");
@@ -70,6 +70,10 @@ public class RecipeInfo {
return overlayMap.containsKey(new OverlayKey(gui.getClass(), ident));
}
public static boolean hasOverlayHandler(Class<? extends GuiContainer> classz, String ident) {
return overlayMap.containsKey(new OverlayKey(classz, ident));
}
public static IOverlayHandler getOverlayHandler(GuiContainer gui, String ident) {
return overlayMap.get(new OverlayKey(gui.getClass(), ident));
}
@@ -182,8 +182,12 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
public List<PositionedStack> getCycledIngredients(int cycle, List<PositionedStack> ingredients) {
if (!NEIClientUtils.shiftKey()) {
for (int itemIndex = 0; itemIndex < ingredients.size(); itemIndex++) {
randomRenderPermutation(ingredients.get(itemIndex), cycle + itemIndex);
if (NEIClientConfig.useJEIStyledCycledIngredients()) {
jeiStyledRenderPermutation(ingredients, cycle);
} else {
for (int itemIndex = 0; itemIndex < ingredients.size(); itemIndex++) {
randomRenderPermutation(ingredients.get(itemIndex), cycle + itemIndex);
}
}
}
@@ -195,6 +199,12 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
stack.setPermutationToRender(Math.abs(rand.nextInt()) % stack.items.length);
}
public void jeiStyledRenderPermutation(List<PositionedStack> stacks, long cycle) {
for (PositionedStack stack : stacks) {
stack.setPermutationToRender((int) (cycle % stack.items.length));
}
}
public void setIngredientPermutation(Collection<PositionedStack> ingredients, ItemStack ingredient) {
for (PositionedStack stack : ingredients) {
for (int i = 0; i < stack.items.length; i++) {
@@ -1343,6 +1343,31 @@ tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactoryRel
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill,MineFactoryReloaded:machine.2:0,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill,MineFactoryReloaded:machine.2:1,,MineFactoryReloaded,TRUE,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSludgeBoiler,MineFactoryReloaded:machine.0:9,,MineFactoryReloaded,TRUE,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerMeatPacker,MineFactoryReloaded:machine.1:14,,MineFactoryReloaded,TRUE,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerComposter,MineFactoryReloaded:machine.0:11,,MineFactoryReloaded,TRUE,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLavaFabricator,MineFactoryReloaded:machine.1:5,,MineFactoryReloaded,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe,ActuallyAdditions:itemBooklet,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe,ActuallyAdditions:itemHairyBall,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double,ActuallyAdditions:blockGrinderDouble,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe,ActuallyAdditions:blockGrinder,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIFurnaceDoubleRecipe,ActuallyAdditions:blockFurnaceDouble,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe,ActuallyAdditions:blockCoffeeMachine,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe,ActuallyAdditions:blockCompost,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe,ActuallyAdditions:blockAtomicReconstructor,,ActuallyAdditions,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe,ActuallyAdditions:blockTreasureChest,,ActuallyAdditions,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerFloatingFlowers,Botania:miniIsland,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerPetalApothecary,Botania:altar,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerRunicAltar,Botania:runeAltar,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerManaPool,Botania:pool,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerElvenTrade,Botania:alfheimPortal,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerBrewery,Botania:brewery,,Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerPureDaisy,Botania:specialFlower,"{type:puredaisy}",Botania,TRUE,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerLexicaBotania,Botania:lexicon,,Botania,TRUE,,,,,,
neiplugins.forge.OreDictionaryList,minecraft:book,,NEIPlugins,TRUE,,,,,,
neiplugins.forge.FluidRegistryList,minecraft:bucket,,NEIPlugins,TRUE,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe,ActuallyAdditions:itemBooklet,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe,ActuallyAdditions:itemHairyBall,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double,ActuallyAdditions:blockGrinderDouble,,ActuallyAdditions,TRUE,,,,,,,,,,,
@@ -1352,3 +1377,38 @@ de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe,ActuallyAdditions:bl
de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe,ActuallyAdditions:blockCompost,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe,ActuallyAdditions:blockAtomicReconstructor,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe,ActuallyAdditions:blockTreasureChest,,ActuallyAdditions,TRUE,,,,,,,,,,,
factorization.nei.RecipeSlagFurnace,factorization:FzBlock:11,,factorization,TRUE,,,,,,
factorization.nei.RecipeCrystallizer,factorization:FzBlock:19,,factorization,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.WorktableRecipeHandler,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ToolChargingHandler,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ToolCraftingHandler,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.BlastFurnaceHandler,RotaryCraft:rotarycraft_item_machine:45,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.GrinderHandler,RotaryCraft:rotarycraft_item_machine:11,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ExtractorHandler,RotaryCraft:rotarycraft_item_machine:20,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FermenterHandler,RotaryCraft:rotarycraft_item_machine:7,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.CompactorHandler,RotaryCraft:rotarycraft_item_machine:22,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.PulseJetHandler,RotaryCraft:rotarycraft_item_machine:21,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FractionHandler,RotaryCraft:rotarycraft_item_machine:25,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.CrystallizerHandler,RotaryCraft:rotarycraft_item_machine:110,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FridgeHandler,RotaryCraft:rotarycraft_item_machine:118,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FillingStationHandler,RotaryCraft:rotarycraft_item_machine:101,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FrictionHandler,RotaryCraft:rotarycraft_item_machine:67,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FrictionHandler,minecraft:furnace,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ComposterHandler,RotaryCraft:rotarycraft_item_machine:121,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.LavaMakerHandler,RotaryCraft:rotarycraft_item_machine:91,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.CentrifugeHandler,RotaryCraft:rotarycraft_item_machine:125,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.DryingBedHandler,RotaryCraft:rotarycraft_item_machine:127,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.WetterHandler,RotaryCraft:rotarycraft_item_machine:128,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FuelEnhancerHandler,RotaryCraft:rotarycraft_item_machine:86,,RotaryCraft,TRUE,,,,,,
Reika.RotaryCraft.ModInterface.NEI.DropProcessorHandler,RotaryCraft:rotarycraft_item_machine:129,,RotaryCraft,TRUE,,,,,,
Reika.ReactorCraft.NEI.SynthesizerHandler,ReactorCraft:reactorcraft_item_placer:14,,ReactorCraft,TRUE,,,,,,
Reika.ReactorCraft.NEI.UProcessorHandler,ReactorCraft:reactorcraft_item_placer:9,,ReactorCraft,TRUE,,,,,,
Reika.ReactorCraft.NEI.CentrifugeHandler,ReactorCraft:reactorcraft_item_placer:8,,ReactorCraft,TRUE,,,,,,
Reika.ReactorCraft.NEI.ElectrolyzerHandler,ReactorCraft:reactorcraft_item_placer:16,,ReactorCraft,TRUE,,,,,,
Reika.ReactorCraft.NEI.ElectrolyzerHandler,RotaryCraft:rotarycraft_item_machine:103,,RotaryCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.CrystalBrewerHandler,ChromatiCraft:chromaticraft_item_placer:7,,ChromatiCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.CrystalFurnaceHandler,ChromatiCraft:chromaticraft_item_placer:15,,ChromatiCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.GlowFireHandler,ChromatiCraft:chromaticraft_item_placer:60,,ChromatiCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler,ChromatiCraft:chromaticraft_item_placer:69,,ChromatiCraft,TRUE,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler,ChromatiCraft:chromaticraft_item_placer:23,,ChromatiCraft,TRUE,,,,,,
tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor,BigReactors:BRDevice:0,,BigReactors,TRUE,,,,,,
1 handler itemName nbtInfo modId modRequired excludedModId priority minVersion maxVersion forceClassName itemNotes
1343 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder MineFactoryReloaded:machine.0:13 MineFactoryReloaded TRUE
1344 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor MineFactoryReloaded:machine.1:10 MineFactoryReloaded TRUE
1345 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse MineFactoryReloaded:machine.1:13 MineFactoryReloaded TRUE
1346 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill MineFactoryReloaded:machine.2:0 MineFactoryReloaded TRUE
1347 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill MineFactoryReloaded:machine.2:1 MineFactoryReloaded TRUE
1348 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSludgeBoiler MineFactoryReloaded:machine.0:9 MineFactoryReloaded TRUE
1349 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerMeatPacker MineFactoryReloaded:machine.1:14 MineFactoryReloaded TRUE
1350 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerComposter MineFactoryReloaded:machine.0:11 MineFactoryReloaded TRUE
1351 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLavaFabricator MineFactoryReloaded:machine.1:5 MineFactoryReloaded TRUE
1352 de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe ActuallyAdditions:itemBooklet ActuallyAdditions TRUE
1353 de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe ActuallyAdditions:itemHairyBall ActuallyAdditions TRUE
1354 de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double ActuallyAdditions:blockGrinderDouble ActuallyAdditions TRUE
1355 de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe ActuallyAdditions:blockGrinder ActuallyAdditions TRUE
1356 de.ellpeck.actuallyadditions.mod.nei.NEIFurnaceDoubleRecipe ActuallyAdditions:blockFurnaceDouble ActuallyAdditions TRUE
1357 de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe ActuallyAdditions:blockCoffeeMachine ActuallyAdditions TRUE
1358 de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe ActuallyAdditions:blockCompost ActuallyAdditions TRUE
1359 de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe ActuallyAdditions:blockAtomicReconstructor ActuallyAdditions TRUE
1360 de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe ActuallyAdditions:blockTreasureChest ActuallyAdditions TRUE
1361 vazkii.botania.client.integration.nei.RecipeHandlerFloatingFlowers Botania:miniIsland Botania TRUE
1362 vazkii.botania.client.integration.nei.RecipeHandlerPetalApothecary Botania:altar Botania TRUE
1363 vazkii.botania.client.integration.nei.RecipeHandlerRunicAltar Botania:runeAltar Botania TRUE
1364 vazkii.botania.client.integration.nei.RecipeHandlerManaPool Botania:pool Botania TRUE
1365 vazkii.botania.client.integration.nei.RecipeHandlerElvenTrade Botania:alfheimPortal Botania TRUE
1366 vazkii.botania.client.integration.nei.RecipeHandlerBrewery Botania:brewery Botania TRUE
1367 vazkii.botania.client.integration.nei.RecipeHandlerPureDaisy Botania:specialFlower {type:puredaisy} Botania TRUE
1368 vazkii.botania.client.integration.nei.RecipeHandlerLexicaBotania Botania:lexicon Botania TRUE
1369 neiplugins.forge.OreDictionaryList minecraft:book NEIPlugins TRUE
1370 neiplugins.forge.FluidRegistryList minecraft:bucket NEIPlugins TRUE
1371 de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe ActuallyAdditions:itemBooklet ActuallyAdditions TRUE
1372 de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe ActuallyAdditions:itemHairyBall ActuallyAdditions TRUE
1373 de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double ActuallyAdditions:blockGrinderDouble ActuallyAdditions TRUE
1377 de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe ActuallyAdditions:blockCompost ActuallyAdditions TRUE
1378 de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe ActuallyAdditions:blockAtomicReconstructor ActuallyAdditions TRUE
1379 de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe ActuallyAdditions:blockTreasureChest ActuallyAdditions TRUE
1380 factorization.nei.RecipeSlagFurnace factorization:FzBlock:11 factorization TRUE
1381 factorization.nei.RecipeCrystallizer factorization:FzBlock:19 factorization TRUE
1382 Reika.RotaryCraft.ModInterface.NEI.WorktableRecipeHandler RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE
1383 Reika.RotaryCraft.ModInterface.NEI.ToolChargingHandler RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE
1384 Reika.RotaryCraft.ModInterface.NEI.ToolCraftingHandler RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE
1385 Reika.RotaryCraft.ModInterface.NEI.BlastFurnaceHandler RotaryCraft:rotarycraft_item_machine:45 RotaryCraft TRUE
1386 Reika.RotaryCraft.ModInterface.NEI.GrinderHandler RotaryCraft:rotarycraft_item_machine:11 RotaryCraft TRUE
1387 Reika.RotaryCraft.ModInterface.NEI.ExtractorHandler RotaryCraft:rotarycraft_item_machine:20 RotaryCraft TRUE
1388 Reika.RotaryCraft.ModInterface.NEI.FermenterHandler RotaryCraft:rotarycraft_item_machine:7 RotaryCraft TRUE
1389 Reika.RotaryCraft.ModInterface.NEI.CompactorHandler RotaryCraft:rotarycraft_item_machine:22 RotaryCraft TRUE
1390 Reika.RotaryCraft.ModInterface.NEI.PulseJetHandler RotaryCraft:rotarycraft_item_machine:21 RotaryCraft TRUE
1391 Reika.RotaryCraft.ModInterface.NEI.FractionHandler RotaryCraft:rotarycraft_item_machine:25 RotaryCraft TRUE
1392 Reika.RotaryCraft.ModInterface.NEI.CrystallizerHandler RotaryCraft:rotarycraft_item_machine:110 RotaryCraft TRUE
1393 Reika.RotaryCraft.ModInterface.NEI.FridgeHandler RotaryCraft:rotarycraft_item_machine:118 RotaryCraft TRUE
1394 Reika.RotaryCraft.ModInterface.NEI.FillingStationHandler RotaryCraft:rotarycraft_item_machine:101 RotaryCraft TRUE
1395 Reika.RotaryCraft.ModInterface.NEI.FrictionHandler RotaryCraft:rotarycraft_item_machine:67 RotaryCraft TRUE
1396 Reika.RotaryCraft.ModInterface.NEI.FrictionHandler minecraft:furnace RotaryCraft TRUE
1397 Reika.RotaryCraft.ModInterface.NEI.ComposterHandler RotaryCraft:rotarycraft_item_machine:121 RotaryCraft TRUE
1398 Reika.RotaryCraft.ModInterface.NEI.LavaMakerHandler RotaryCraft:rotarycraft_item_machine:91 RotaryCraft TRUE
1399 Reika.RotaryCraft.ModInterface.NEI.CentrifugeHandler RotaryCraft:rotarycraft_item_machine:125 RotaryCraft TRUE
1400 Reika.RotaryCraft.ModInterface.NEI.DryingBedHandler RotaryCraft:rotarycraft_item_machine:127 RotaryCraft TRUE
1401 Reika.RotaryCraft.ModInterface.NEI.WetterHandler RotaryCraft:rotarycraft_item_machine:128 RotaryCraft TRUE
1402 Reika.RotaryCraft.ModInterface.NEI.FuelEnhancerHandler RotaryCraft:rotarycraft_item_machine:86 RotaryCraft TRUE
1403 Reika.RotaryCraft.ModInterface.NEI.DropProcessorHandler RotaryCraft:rotarycraft_item_machine:129 RotaryCraft TRUE
1404 Reika.ReactorCraft.NEI.SynthesizerHandler ReactorCraft:reactorcraft_item_placer:14 ReactorCraft TRUE
1405 Reika.ReactorCraft.NEI.UProcessorHandler ReactorCraft:reactorcraft_item_placer:9 ReactorCraft TRUE
1406 Reika.ReactorCraft.NEI.CentrifugeHandler ReactorCraft:reactorcraft_item_placer:8 ReactorCraft TRUE
1407 Reika.ReactorCraft.NEI.ElectrolyzerHandler ReactorCraft:reactorcraft_item_placer:16 ReactorCraft TRUE
1408 Reika.ReactorCraft.NEI.ElectrolyzerHandler RotaryCraft:rotarycraft_item_machine:103 RotaryCraft TRUE
1409 Reika.ChromatiCraft.ModInterface.NEI.CrystalBrewerHandler ChromatiCraft:chromaticraft_item_placer:7 ChromatiCraft TRUE
1410 Reika.ChromatiCraft.ModInterface.NEI.CrystalFurnaceHandler ChromatiCraft:chromaticraft_item_placer:15 ChromatiCraft TRUE
1411 Reika.ChromatiCraft.ModInterface.NEI.GlowFireHandler ChromatiCraft:chromaticraft_item_placer:60 ChromatiCraft TRUE
1412 Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler ChromatiCraft:chromaticraft_item_placer:69 ChromatiCraft TRUE
1413 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
1414 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor BigReactors:BRDevice:0 BigReactors TRUE
+57 -7
View File
@@ -170,12 +170,12 @@ ic2.neiIntegration.core.recipehandler.BlockCutterRecipeHandler,IndustrialCraft 2
ic2.neiIntegration.core.recipehandler.CentrifugeRecipeHandler,IndustrialCraft 2,IC2:blockMachine2:3,,IC2,TRUE,,,65,,5,,,,,,
ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,IndustrialCraft 2,IC2:blockMachine:5,,IC2,TRUE,,,65,,5,,,,,,
ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,IndustrialCraft 2,IC2:blockMachine:4,,IC2,TRUE,,,65,,5,,,,,,
ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler,IndustrialCraft 2,IC2:blockMachine:6,,IC2,TRUE,,,75,,4,,,,,,
ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler,IndustrialCraft 2,IC2:blockMachine:6,,IC2,TRUE,,,85,,4,,,,,,
ic2.neiIntegration.core.recipehandler.LatheRecipeHandler,IndustrialCraft 2,IC2:blockMachine3:8,,IC2,TRUE,,,65,,5,,,,,,
ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,IndustrialCraft 2,IC2:blockMachine:3,,IC2,TRUE,,,65,,5,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerCutting,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,55,,6,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerExtruding,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,55,,6,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerRolling,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,55,,6,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerCutting,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,65,,6,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerExtruding,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,65,,6,,,,,,
ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerRolling,IndustrialCraft 2,IC2:blockMachine2:4,,IC2,TRUE,,,65,,6,,,,,,
ic2.neiIntegration.core.recipehandler.OreWashingRecipeHandler,IndustrialCraft 2,IC2:blockMachine2:5,,IC2,TRUE,,,,,,,,,,,
ic2.neiIntegration.core.recipehandler.ScrapboxRecipeHandler,IndustrialCraft 2,IC2:itemScrapbox,,IC2,TRUE,,,50,,6,,,,,,
ic2.neiIntegration.core.recipehandler.SolidCannerRecipeHandler,IndustrialCraft 2,IC2:blockMachine2:9,,IC2,TRUE,,,,,,,,,,,
@@ -507,10 +507,15 @@ net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,Ex Compres
com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler,AgriCraft,AgriCraft:cropsItem,,AgriCraft,TRUE,,,85,166,5,,,,,,
com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactory Reloaded,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactory Reloaded,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactory Reloaded,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactory Reloaded,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactory Reloaded,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactory Reloaded,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactory Reloaded,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill,MineFactory Reloaded,MineFactoryReloaded:machine.2:0,,MineFactoryReloaded,TRUE,,,,,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSludgeBoiler,MineFactory Reloaded,MineFactoryReloaded:machine.0:9,,MineFactoryReloaded,TRUE,,,,,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerMeatPacker,MineFactory Reloaded,MineFactoryReloaded:machine.1:14,,MineFactoryReloaded,TRUE,,,,,5,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerComposter,MineFactory Reloaded,MineFactoryReloaded:machine.0:11,,MineFactoryReloaded,TRUE,,,,,,,,,,,
tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLavaFabricator,MineFactory Reloaded,MineFactoryReloaded:machine.1:5,,MineFactoryReloaded,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe,Actually Additions,ActuallyAdditions:itemBooklet,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe,Actually Additions,ActuallyAdditions:itemHairyBall,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double,Actually Additions,ActuallyAdditions:blockGrinderDouble,,ActuallyAdditions,TRUE,,,,,,,,,,,
@@ -520,4 +525,49 @@ de.ellpeck.actuallyadditions.mod.nei.NEICoffeeMachineRecipe,Actually Additions,A
de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe,Actually Additions,ActuallyAdditions:blockCompost,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe,Actually Additions,ActuallyAdditions:blockAtomicReconstructor,,ActuallyAdditions,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe,Actually Additions,ActuallyAdditions:blockTreasureChest,,ActuallyAdditions,TRUE,,,,,,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerFloatingFlowers,Botania,Botania:miniIsland,,Botania,TRUE,,,,,5,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerPetalApothecary,Botania,Botania:altar,,Botania,TRUE,,,102,137,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerRunicAltar,Botania,Botania:runeAltar,,Botania,TRUE,,,122,137,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerManaPool,Botania,Botania:pool,,Botania,TRUE,,,90,137,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerElvenTrade,Botania,Botania:alfheimPortal,,Botania,TRUE,,,90,130,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerBrewery,Botania,Botania:brewery,,Botania,TRUE,,,,,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerPureDaisy,Botania,Botania:specialFlower,"{type:puredaisy}",Botania,TRUE,,,,,4,,,,,,
vazkii.botania.client.integration.nei.RecipeHandlerLexicaBotania,Botania,Botania:lexicon,,Botania,TRUE,,,,,,,,,,,
neiplugins.forge.OreDictionaryList,NEIPlugins,minecraft:book,,NEIPlugins,TRUE,,,,,,,,,,,
neiplugins.forge.FluidRegistryList,NEIPlugins,minecraft:bucket,,NEIPlugins,TRUE,,,,,,,,,,,
de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe,Actually Additions,ActuallyAdditions:blockTreasureChest,,ActuallyAdditions,TRUE,,,,,,,,,,,
factorization.nei.RecipeGrinder,Factorization,factorization:diamond_cutting_head,,factorization,TRUE,,,,,3,,,,,,
factorization.nei.RecipeSlagFurnace,Factorization,factorization:FzBlock:11,,factorization,TRUE,,,,,3,,,,,,
factorization.nei.RecipeCrystallizer,Factorization,factorization:FzBlock:19,,factorization,TRUE,,,100,,2,,,,,,
Reika.RotaryCraft.ModInterface.NEI.WorktableRecipeHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ToolChargingHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ToolCraftingHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:75,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.BlastFurnaceHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:45,,RotaryCraft,TRUE,,,115,,3,,,,,,
Reika.RotaryCraft.ModInterface.NEI.GrinderHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:11,,RotaryCraft,TRUE,,,70,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ExtractorHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:20,,RotaryCraft,TRUE,,,115,,3,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FermenterHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:7,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.CompactorHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:22,,RotaryCraft,TRUE,,,115,,3,,,,,,
Reika.RotaryCraft.ModInterface.NEI.PulseJetHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:21,,RotaryCraft,TRUE,,,75,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FractionHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:25,,RotaryCraft,TRUE,,,,,,,,,,,Single Recipe
Reika.RotaryCraft.ModInterface.NEI.CrystallizerHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:110,,RotaryCraft,TRUE,,,75,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FridgeHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:118,,RotaryCraft,TRUE,,,,,,,,,,,Single Recipe
Reika.RotaryCraft.ModInterface.NEI.FillingStationHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:101,,RotaryCraft,TRUE,,,75,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FrictionHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:67,,RotaryCraft,TRUE,,,110,,3,,,,,,
Reika.RotaryCraft.ModInterface.NEI.ComposterHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:121,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.LavaMakerHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:91,,RotaryCraft,TRUE,,,75,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.CentrifugeHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:125,,RotaryCraft,TRUE,,,80,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.DryingBedHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:127,,RotaryCraft,TRUE,,,75,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.WetterHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:128,,RotaryCraft,TRUE,,,,,5,,,,,,
Reika.RotaryCraft.ModInterface.NEI.FuelEnhancerHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:86,,RotaryCraft,TRUE,,,,,,,,,,,
Reika.RotaryCraft.ModInterface.NEI.DropProcessorHandler,RotaryCraft,RotaryCraft:rotarycraft_item_machine:129,,RotaryCraft,TRUE,,,,,,,,,,,Searching for the Usage of a Drop Processor results in a glitchy and useless first page
Reika.ReactorCraft.NEI.SynthesizerHandler,ReactorCraft,ReactorCraft:reactorcraft_item_placer:14,,ReactorCraft,TRUE,,,75,,2,,,,,,
Reika.ReactorCraft.NEI.UProcessorHandler,ReactorCraft,ReactorCraft:reactorcraft_item_placer:9,,ReactorCraft,TRUE,,,,,,,,,,,Single Recipe
Reika.ReactorCraft.NEI.CentrifugeHandler,ReactorCraft,ReactorCraft:reactorcraft_item_placer:8,,ReactorCraft,TRUE,,,,,,,,,,,Single Recipe
Reika.ReactorCraft.NEI.ElectrolyzerHandler,ReactorCraft,ReactorCraft:reactorcraft_item_placer:16,,ReactorCraft,TRUE,,,,,5,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.CrystalBrewerHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:7,,ChromatiCraft,TRUE,,,,,5,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.CrystalFurnaceHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:15,,ChromatiCraft,TRUE,,,,,5,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.GlowFireHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:60,,ChromatiCraft,TRUE,,,,,,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:69,,ChromatiCraft,TRUE,,,,,5,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler,ChromatiCraft,ChromatiCraft:chromaticraft_item_placer:23,,ChromatiCraft,TRUE,,,,,,,,,,,
Reika.ChromatiCraft.ModInterface.NEI.PlantDustHandler,ChromatiCraft,ChromatiCraft:chromaticraft_block_decoflower:0,,ChromatiCraft,TRUE,,,,,3,,,,,,Anything other than 3 high tiling looks wrong
tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor,Big Reactors,BigReactors:BRDevice:0,,BigReactors,TRUE,,,,,,,,,,,
1 handler modName itemName nbtInfo modId modRequired excludedModId yShift handlerHeight handlerWidth maxRecipesPerPage imageResource imageX imageY imageWidth imageHeight itemNotes
170 ic2.neiIntegration.core.recipehandler.CentrifugeRecipeHandler IndustrialCraft 2 IC2:blockMachine2:3 IC2 TRUE 65 5
171 ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler IndustrialCraft 2 IC2:blockMachine:5 IC2 TRUE 65 5
172 ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler IndustrialCraft 2 IC2:blockMachine:4 IC2 TRUE 65 5
173 ic2.neiIntegration.core.recipehandler.FluidCannerRecipeHandler IndustrialCraft 2 IC2:blockMachine:6 IC2 TRUE 75 85 4
174 ic2.neiIntegration.core.recipehandler.LatheRecipeHandler IndustrialCraft 2 IC2:blockMachine3:8 IC2 TRUE 65 5
175 ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler IndustrialCraft 2 IC2:blockMachine:3 IC2 TRUE 65 5
176 ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerCutting IndustrialCraft 2 IC2:blockMachine2:4 IC2 TRUE 55 65 6
177 ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerExtruding IndustrialCraft 2 IC2:blockMachine2:4 IC2 TRUE 55 65 6
178 ic2.neiIntegration.core.recipehandler.MetalFormerRecipeHandlerRolling IndustrialCraft 2 IC2:blockMachine2:4 IC2 TRUE 55 65 6
179 ic2.neiIntegration.core.recipehandler.OreWashingRecipeHandler IndustrialCraft 2 IC2:blockMachine2:5 IC2 TRUE
180 ic2.neiIntegration.core.recipehandler.ScrapboxRecipeHandler IndustrialCraft 2 IC2:itemScrapbox IC2 TRUE 50 6
181 ic2.neiIntegration.core.recipehandler.SolidCannerRecipeHandler IndustrialCraft 2 IC2:blockMachine2:9 IC2 TRUE
507 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler AgriCraft AgriCraft:cropsItem AgriCraft TRUE 85 166 5
508 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler AgriCraft minecraft:farmland AgriCraft TRUE 85 166 5
509 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester MineFactory Reloaded MineFactoryReloaded:machine.0:2 MineFactoryReloaded TRUE
510 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer MineFactory Reloaded MineFactoryReloaded:machine.0:10 MineFactoryReloaded TRUE 5
511 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder MineFactory Reloaded MineFactoryReloaded:machine.0:13 MineFactoryReloaded TRUE
512 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor MineFactory Reloaded MineFactoryReloaded:machine.1:10 MineFactoryReloaded TRUE 5
513 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse MineFactory Reloaded MineFactoryReloaded:machine.1:13 MineFactoryReloaded TRUE
514 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLaserDrill MineFactory Reloaded MineFactoryReloaded:machine.2:0 MineFactoryReloaded TRUE 5
515 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSludgeBoiler MineFactory Reloaded MineFactoryReloaded:machine.0:9 MineFactoryReloaded TRUE 5
516 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerMeatPacker MineFactory Reloaded MineFactoryReloaded:machine.1:14 MineFactoryReloaded TRUE 5
517 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerComposter MineFactory Reloaded MineFactoryReloaded:machine.0:11 MineFactoryReloaded TRUE
518 tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerLavaFabricator MineFactory Reloaded MineFactoryReloaded:machine.1:5 MineFactoryReloaded TRUE
519 de.ellpeck.actuallyadditions.mod.nei.NEIBookletRecipe Actually Additions ActuallyAdditions:itemBooklet ActuallyAdditions TRUE
520 de.ellpeck.actuallyadditions.mod.nei.NEIHairyBallRecipe Actually Additions ActuallyAdditions:itemHairyBall ActuallyAdditions TRUE
521 de.ellpeck.actuallyadditions.mod.nei.NEICrusherRecipe$Double Actually Additions ActuallyAdditions:blockGrinderDouble ActuallyAdditions TRUE
525 de.ellpeck.actuallyadditions.mod.nei.NEICompostRecipe Actually Additions ActuallyAdditions:blockCompost ActuallyAdditions TRUE
526 de.ellpeck.actuallyadditions.mod.nei.NEIReconstructorRecipe Actually Additions ActuallyAdditions:blockAtomicReconstructor ActuallyAdditions TRUE
527 de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe Actually Additions ActuallyAdditions:blockTreasureChest ActuallyAdditions TRUE
528 vazkii.botania.client.integration.nei.RecipeHandlerFloatingFlowers Botania Botania:miniIsland Botania TRUE 5
529 vazkii.botania.client.integration.nei.RecipeHandlerPetalApothecary Botania Botania:altar Botania TRUE 102 137 4
530 vazkii.botania.client.integration.nei.RecipeHandlerRunicAltar Botania Botania:runeAltar Botania TRUE 122 137 4
531 vazkii.botania.client.integration.nei.RecipeHandlerManaPool Botania Botania:pool Botania TRUE 90 137 4
532 vazkii.botania.client.integration.nei.RecipeHandlerElvenTrade Botania Botania:alfheimPortal Botania TRUE 90 130 4
533 vazkii.botania.client.integration.nei.RecipeHandlerBrewery Botania Botania:brewery Botania TRUE 4
534 vazkii.botania.client.integration.nei.RecipeHandlerPureDaisy Botania Botania:specialFlower {type:puredaisy} Botania TRUE 4
535 vazkii.botania.client.integration.nei.RecipeHandlerLexicaBotania Botania Botania:lexicon Botania TRUE
536 neiplugins.forge.OreDictionaryList NEIPlugins minecraft:book NEIPlugins TRUE
537 neiplugins.forge.FluidRegistryList NEIPlugins minecraft:bucket NEIPlugins TRUE
538 de.ellpeck.actuallyadditions.mod.nei.NEITreasureChestRecipe Actually Additions ActuallyAdditions:blockTreasureChest ActuallyAdditions TRUE
539 factorization.nei.RecipeGrinder Factorization factorization:diamond_cutting_head factorization TRUE 3
540 factorization.nei.RecipeSlagFurnace Factorization factorization:FzBlock:11 factorization TRUE 3
541 factorization.nei.RecipeCrystallizer Factorization factorization:FzBlock:19 factorization TRUE 100 2
542 Reika.RotaryCraft.ModInterface.NEI.WorktableRecipeHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE 5
543 Reika.RotaryCraft.ModInterface.NEI.ToolChargingHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE 5
544 Reika.RotaryCraft.ModInterface.NEI.ToolCraftingHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:75 RotaryCraft TRUE 5
545 Reika.RotaryCraft.ModInterface.NEI.BlastFurnaceHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:45 RotaryCraft TRUE 115 3
546 Reika.RotaryCraft.ModInterface.NEI.GrinderHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:11 RotaryCraft TRUE 70 5
547 Reika.RotaryCraft.ModInterface.NEI.ExtractorHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:20 RotaryCraft TRUE 115 3
548 Reika.RotaryCraft.ModInterface.NEI.FermenterHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:7 RotaryCraft TRUE 5
549 Reika.RotaryCraft.ModInterface.NEI.CompactorHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:22 RotaryCraft TRUE 115 3
550 Reika.RotaryCraft.ModInterface.NEI.PulseJetHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:21 RotaryCraft TRUE 75 5
551 Reika.RotaryCraft.ModInterface.NEI.FractionHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:25 RotaryCraft TRUE Single Recipe
552 Reika.RotaryCraft.ModInterface.NEI.CrystallizerHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:110 RotaryCraft TRUE 75 5
553 Reika.RotaryCraft.ModInterface.NEI.FridgeHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:118 RotaryCraft TRUE Single Recipe
554 Reika.RotaryCraft.ModInterface.NEI.FillingStationHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:101 RotaryCraft TRUE 75 5
555 Reika.RotaryCraft.ModInterface.NEI.FrictionHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:67 RotaryCraft TRUE 110 3
556 Reika.RotaryCraft.ModInterface.NEI.ComposterHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:121 RotaryCraft TRUE 5
557 Reika.RotaryCraft.ModInterface.NEI.LavaMakerHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:91 RotaryCraft TRUE 75 5
558 Reika.RotaryCraft.ModInterface.NEI.CentrifugeHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:125 RotaryCraft TRUE 80 5
559 Reika.RotaryCraft.ModInterface.NEI.DryingBedHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:127 RotaryCraft TRUE 75 5
560 Reika.RotaryCraft.ModInterface.NEI.WetterHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:128 RotaryCraft TRUE 5
561 Reika.RotaryCraft.ModInterface.NEI.FuelEnhancerHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:86 RotaryCraft TRUE
562 Reika.RotaryCraft.ModInterface.NEI.DropProcessorHandler RotaryCraft RotaryCraft:rotarycraft_item_machine:129 RotaryCraft TRUE Searching for the Usage of a Drop Processor results in a glitchy and useless first page
563 Reika.ReactorCraft.NEI.SynthesizerHandler ReactorCraft ReactorCraft:reactorcraft_item_placer:14 ReactorCraft TRUE 75 2
564 Reika.ReactorCraft.NEI.UProcessorHandler ReactorCraft ReactorCraft:reactorcraft_item_placer:9 ReactorCraft TRUE Single Recipe
565 Reika.ReactorCraft.NEI.CentrifugeHandler ReactorCraft ReactorCraft:reactorcraft_item_placer:8 ReactorCraft TRUE Single Recipe
566 Reika.ReactorCraft.NEI.ElectrolyzerHandler ReactorCraft ReactorCraft:reactorcraft_item_placer:16 ReactorCraft TRUE 5
567 Reika.ChromatiCraft.ModInterface.NEI.CrystalBrewerHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:7 ChromatiCraft TRUE 5
568 Reika.ChromatiCraft.ModInterface.NEI.CrystalFurnaceHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:15 ChromatiCraft TRUE 5
569 Reika.ChromatiCraft.ModInterface.NEI.GlowFireHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:60 ChromatiCraft TRUE
570 Reika.ChromatiCraft.ModInterface.NEI.EnchantDecompHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:69 ChromatiCraft TRUE 5
571 Reika.ChromatiCraft.ModInterface.NEI.FabricatorHandler ChromatiCraft ChromatiCraft:chromaticraft_item_placer:23 ChromatiCraft TRUE
572 Reika.ChromatiCraft.ModInterface.NEI.PlantDustHandler ChromatiCraft ChromatiCraft:chromaticraft_block_decoflower:0 ChromatiCraft TRUE 3 Anything other than 3 high tiling looks wrong
573 tonius.neiintegration.mods.bigreactors.RecipeHandlerCyaniteReprocessor Big Reactors BigReactors:BRDevice:0 BigReactors TRUE
@@ -56,6 +56,7 @@ nei.inventory.current.gamemode.0=Current gamemode: survival
nei.inventory.current.gamemode.1=Current gamemode: creative
nei.inventory.current.gamemode.2=Current gamemode: creative+
nei.inventory.current.gamemode.3=Current gamemode: adventure
nei.inventory.tooltip.page=Page: %s / %s [Press %s to see next page]
nei.inventory.gamemode.0=Click: Set gamemode to survival
nei.inventory.gamemode.1=Click: Set gamemode to creative
@@ -108,6 +109,7 @@ nei.options.keys.gui.overlay_hide=Hide Overlay Recipe
nei.options.keys.gui.overlay_use=Use Overlay Recipe
nei.options.keys.gui.getprevioussearch=Previous Search
nei.options.keys.gui.getnextsearch=Next Search
nei.options.keys.gui.next_tooltip=Next Tooltip
nei.options.keys.world=World
nei.options.keys.world.chunkoverlay=Chunk Boundary Overlay
nei.options.keys.world.moboverlay=Mob Spawn Overlay
@@ -164,6 +166,12 @@ nei.options.inventory.ignore_potion_overlap.false=No
nei.options.inventory.optimize_gui_overlap_computation=Optimize computation for GUI overlap
nei.options.inventory.optimize_gui_overlap_computation.true=Yes
nei.options.inventory.optimize_gui_overlap_computation.false=No
nei.options.inventory.jei_style_cycled_ingredients=JEI styled cycled ingredients
nei.options.inventory.jei_style_cycled_ingredients.true=Yes
nei.options.inventory.jei_style_cycled_ingredients.false=No
nei.options.inventory.shift_overlay_recipe=Require holding shift to move items when overlaying recipe
nei.options.inventory.shift_overlay_recipe.true=Yes
nei.options.inventory.shift_overlay_recipe.false=No
nei.options.inventory.widgetsenabled.true=NEI Enabled
nei.options.inventory.widgetsenabled.false=NEI Disabled
nei.options.inventory.cheatmode.0=Recipe Mode
+2 -2
View File
@@ -1,7 +1,7 @@
{
"repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.6/",
"file": "CodeChickenLib-1.7.10-1.1.6.jar",
"dev": "CodeChickenLib-1.7.10-1.1.6-dev.jar",
"file": "CodeChickenLib-1.1.6.jar",
"dev": "CodeChickenLib-1.1.6-dev.jar",
"class": "codechicken.lib.asm.ASMHelper",
"coreLib": true
}