diff --git a/.editorconfig b/.editorconfig index 90400a1f23..184e0fc830 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,11 +12,6 @@ indent_style = space indent_size = 2 indent_style = space -[common/**.java] -indent_size = 4 -indent_style = tab -ij_java_imports_layout = java.**,javax.**,|,net.minecraft.**,|,net.minecraftforge.**,|,*,|,logisticspipes.**,network.rs485.** - [src/**.java] indent_size = 4 indent_style = space diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000000..0e3eda1653 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,58 @@ +# A deployment template that works out of the box +# It supports these objectives: +# - Deploy to Maven (Build Job) [Secrets: MAVEN_USER, MAVEN_PASS] +# - Deploy to CurseForge (Upload Job) [Secrets: CURSEFORGE_TOKEN] +# - Deploy to Modrinth (Upload Job) [Secrets: MODRINTH_TOKEN] + +name: Deploy + +on: + push: + tags: + - '[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + + - name: Grant Execute Permission for gradlew + run: chmod +x gradlew + + - name: Read gradle.properties + uses: BrycensRanch/read-properties-action@v1 + id: properties + with: + file: gradle.properties + all: true + + - name: Setup Java + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'zulu' + cache: gradle + + - name: Publish to Maven + if: steps.properties.outputs.publish_to_maven == 'true' && steps.properties.outputs.publish_to_local_maven == 'true' + uses: gradle/gradle-build-action@v2 + with: + arguments: | + publish + -P${{ steps.properties.outputs.maven_name }}Username=${{ secrets.MAVEN_USER }} + -P${{ steps.properties.outputs.maven_name }}Password=${{ secrets.MAVEN_PASS }} + + - name: Publish to CurseForge + if: steps.properties.outputs.publish_to_curseforge == 'true' + uses: gradle/gradle-build-action@v2 + with: + arguments: curseforge + + - name: Publish to Modrinth + if: steps.properties.outputs.publish_to_modrinth == 'true' + uses: gradle/gradle-build-action@v2 + with: + arguments: modrinth diff --git a/.gitignore b/.gitignore index e7c7cfd5ad..2c770e09fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,118 +1,22 @@ -# IDEA project output path -/classes -/logs - -# IDEA run configurations -.idea/runConfigurations - -# Created by https://www.gitignore.io/api/java,gradle,kotlin,forgegradle,intellij+iml -# Edit at https://www.gitignore.io/?templates=java,gradle,kotlin,forgegradle,intellij+iml - -### ForgeGradle ### -# Minecraft client/server files -run/* -run-server/* -run-server-test/* -!run/.gitkeep -!run-server/.gitkeep - -### Intellij+iml ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf -.idea/**/vcs.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -.idea/compiler.xml -.idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project -# File-based project format +# idea +out +*.ipr *.iws - -# IntelliJ -out/ - -### Intellij+iml Patch ### -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - *.iml -modules.xml -.idea/misc.xml -*.ipr - -### Java ### -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt +.idea -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* -replay_pid* - -### Gradle ### +# gradle +build .gradle -**/build/ -!src/**/build/ - -# Ignore Gradle GUI config -gradle-app.setting - -# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) -!gradle-wrapper.jar - -# Avoid ignore Gradle wrappper properties -!gradle-wrapper.properties - -# Cache of project -.gradletasknamecache - -# Eclipse Gradle plugin generated files -# Eclipse Core -.project -# JDT-specific (Eclipse Java Development Tools) -.classpath - -### Gradle Patch ### -# Java heap dump -*.hprof -# End of https://www.gitignore.io/api/java,gradle,kotlin,forgegradle,intellij+iml +# other +eclipse +run diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..da1098ef74 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,6 @@ +# Changelog + +## [1.0] - 2023-09-15 + +### Added +- This is a default template changelog that follows the [KeepAChangelog Convention](https://keepachangelog.com/en/1.1.0/) \ No newline at end of file diff --git a/README.md b/README.md index 80fb82c98b..3a028e2350 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,27 @@ # LogisticsPipes -[![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.rs485.network%2Fview%2Fall%2Fjob%2FLogisticsPipes-0.10-mc112)](https://ci.rs485.network/) +[//]: # ([![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.rs485.network%2Fview%2Fall%2Fjob%2FLogisticsPipes-0.10-mc112)](https://ci.rs485.network/)) ![Lines of Code](https://tokei.rs/b1/github/RS485/LogisticsPipes?category=code) Logistics Pipes is an extensive overhaul of the Buildcraft pipe system. It allows for better distribution of items via pipes, more organised stockkeeping and easier automated crafting. -Go to the [CurseForge Page](https://www.curseforge.com/minecraft/mc-mods/logistics-pipes) for more information and recent downloads. -We advise anyone who is not a developer to go there. +Please check out the original mod [CurseForge Page](https://www.curseforge.com/minecraft/mc-mods/logistics-pipes) for more information. -You are free to use this mod in your modpack without asking or noticing us. +This repo is not maintain by same author, please refrain from report issue to them. If the issue comes from the original mod, I ~~and other~~ will try cooperative and fix it if possible. -If you want to understand the sheer amount of changes we have made to the source, you can use [Gource](http://gource.io/) - -Credits for the code goes to all [contributors](https://github.com/RS485/LogisticsPipes/contributors). +Credits to the original author and to all [contributors](https://github.com/RS485/LogisticsPipes/contributors). Credits for the idea and basic code goes to Krapht. ## Translate +[//]: # (TODO change it to own repo if possible) See [this repo](https://github.com/RS485/LogisticsPipes-Language) for translations. ## Builds -See our [Jenkins](https://ci.rs485.network/). - -Our jar certificate fingerprint is `e0c86912b2f7cc0cc646ad57799574aea43dbd45`. - -Our GPG key id is `C4E5 0DBF CE49 AC33 E052 B591 2669 A04F D19F 2F7A` and we sign our jars with the subkey `386B 2790 B001 3BF8 1ED2 2D81 0119 F8E9 56C4 E048`. - -## Contact +Artifacts build using Github Action, which can be found from [here](https://github.com/JP-HellParadise/LogisticsPipes/actions) -Get in touch with us on [Matrix](https://matrix.to/#/#lp:rs485.network) or the [RS485 Discord](https://discord.gg/6vPP3A8) +[//]: # (## Contact) +[//]: # (TODO add new way for support) +[//]: # () +[//]: # (Get in touch with us on [Matrix](https://matrix.to/#/#lp:rs485.network) or the [RS485 Discord](https://discord.gg/6vPP3A8)) diff --git a/build.gradle b/build.gradle index 5db08d07d7..42ad6f60f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,92 +1,103 @@ -buildscript { - repositories { - mavenCentral() - maven { - url = "https://maven.removeco.de/" - } - } - dependencies { - classpath group: 'network.rs485.forge', name: 'ForgeGradle', version: forgegradle_version - } -} +/** + * It is advised that you do not edit anything in the build.gradle; unless you are sure of what you are doing + */ +import com.gtnewhorizons.retrofuturagradle.mcp.InjectTagsTask +import org.jetbrains.gradle.ext.Gradle +import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +import java.time.LocalDate plugins { id 'java' + id 'java-library' id 'maven-publish' + id 'com.diffplug.spotless' version '6.19.0' apply false + id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.7' id 'org.jetbrains.kotlin.jvm' version "$kotlin_version" id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version" id 'org.jetbrains.kotlin.plugin.lombok' version "$kotlin_version" id 'io.freefair.lombok' version "$lombok_plugin_version" - id 'signing' - id 'com.matthewprenger.cursegradle' version "$cursegradle_version" - id 'com.github.johnrengelman.shadow' version "$shadow_version" -} -apply plugin: 'network.rs485.forge' - -archivesBaseName = "logisticspipes" -group = "network.rs485" -version = "0.10.4" -ext.vendor = "unknown" -ext.target = "Forge $forge_version" - -java.toolchain.languageVersion = JavaLanguageVersion.of(8) - -println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" - -def ENV = System.getenv() - -if (ENV.BUILD_NUMBER) { - version = "$version.${ENV.BUILD_NUMBER}" -} else if (ENV.VERSION) { - version = "$version.${ENV.VERSION}" -} else { - version = "$version-SNAPSHOT" + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.24' + id 'com.matthewprenger.cursegradle' version '1.4.0' apply false + id 'com.modrinth.minotaur' version '2.+' apply false + id 'org.jetbrains.changelog' version '2.2.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' +} + +apply plugin: "com.github.johnrengelman.shadow" + +apply from: 'gradle/scripts/helpers.gradle' + +// Early Assertions +assertProperty 'mod_version' +assertProperty 'root_package' +assertProperty 'mod_id' +assertProperty 'mod_name' + +assertSubProperties 'use_tags', 'tag_class_name' +assertSubProperties 'use_access_transformer', 'access_transformer_locations' +assertSubProperties 'use_mixins', 'mixin_booter_version', 'mixin_refmap' +assertSubProperties 'is_coremod', 'coremod_includes_mod', 'coremod_plugin_class_name' +assertSubProperties 'use_asset_mover', 'asset_mover_version' + +setDefaultProperty 'use_modern_java_syntax', false, false +setDefaultProperty 'spotless', false, false +setDefaultProperty 'generate_sources_jar', true, false +setDefaultProperty 'generate_javadocs_jar', true, false +setDefaultProperty 'mapping_channel', true, 'stable' +setDefaultProperty 'mapping_version', true, '39' +setDefaultProperty 'use_dependency_at_files', true, true +setDefaultProperty 'minecraft_username', true, 'Developer' +setDefaultProperty 'extra_jvm_args', false, '' +setDefaultProperty 'extra_tweak_classes', false, '' +setDefaultProperty 'change_minecraft_sources', false, false + +version = propertyString('mod_version') +group = propertyString('root_package') + +base { + archivesName.set(propertyString('mod_id')) +} + +tasks.decompressDecompiledSources.enabled !propertyBool('change_minecraft_sources') + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(propertyBool('use_modern_java_syntax') ? 16 : 8)) + // Azul covers the most platforms for Java 8 toolchains, crucially including MacOS arm64 + vendor.set(JvmVendorSpec.AZUL) + } + if (propertyBool('generate_sources_jar')) { + withSourcesJar() + } + if (propertyBool('generate_javadocs_jar')) { + withJavadocJar() + } } -if (ENV.JENKINS_URL) { - ext.vendor = ENV.JENKINS_URL -} else if (ENV.JITPACK) { - ext.vendor = "JitPack.io" - group = ENV.GROUP -} +configurations { + for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath, testImplementation]) { + config.extendsFrom(shadowImplementation) + } + + testCompileOnly.extendsFrom (compileOnly) -ext.sharedManifest = manifest { - attributes( - 'FMLCorePlugin': 'logisticspipes.asm.LogisticsPipesCoreLoader', - 'FMLCorePluginContainsFMLMod': 'true', - 'FMLAT': 'lp_at.cfg', - 'Specification-Title': 'LogisticsPipes', - 'Specification-Vendor': 'RS485', - 'Specification-Version': '1', - 'Implementation-Vendor': "$vendor", - 'Implementation-Title': "${project.name}", - 'Implementation-Version': "$version", - 'Implementation-Target': "$target", - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")) + ktlint } sourceSets { api { - java { - srcDirs = ['src/api/java'] - } + compileClasspath += patchedMc.output } dummy { - java { - srcDirs = ['dummy/src/main/java'] - } + compileClasspath += patchedMc.output } main { compileClasspath += dummy.output compileClasspath += api.output runtimeClasspath += api.output - - java { - srcDirs += 'common' - } - resources { - srcDirs += 'resources' - } } test { compileClasspath += dummy.output @@ -95,574 +106,339 @@ sourceSets { } } -configurations { - testCompileOnly.extendsFrom compileOnly - ktlint -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { - kotlinOptions { - languageVersion = "1.7" - jvmTarget = JavaVersion.VERSION_1_8 - freeCompilerArgs += "-Xjvm-default=all" - } -} - -kotlinLombok { - lombokConfigurationFile file("lombok.config") -} - -project.afterEvaluate { - tasks.register('copyRunClasses', Copy.class) { - dependsOn ['classes'] - from sourceSets.main.output.classesDirs, sourceSets.main.output.resourcesDir, sourceSets.api.output.classesDirs - into "${project.buildDir}/run_classes/" - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - includeEmptyDirs false - } - - tasks['prepareRuns'].dependsOn('copyRunClasses') -} - minecraft { - mappings channel: 'snapshot', version: "$mappings_version" - accessTransformer = file("$rootDir/resources/META-INF/lp_at.cfg") - - runs { - client { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + mcVersion.set('1.12.2') - // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' + mcpMappingChannel.set(propertyString('mapping_channel')) + mcpMappingVersion.set(propertyString('mapping_version')) - // load LP core mod from classpath - property 'fml.coreMods.load', 'logisticspipes.asm.LogisticsPipesCoreLoader' + useDependencyAccessTransformers.set(propertyBool('use_dependency_at_files')) - jvmArgs '-ea' - environment 'MC_VERSION', mcversion + username.set(propertyString('minecraft_username')) + + // Add any additional tweaker classes here + extraTweakClasses.addAll(propertyStringList('extra_tweak_classes')) - lazyToken 'classpathExclude', { - def paths = [ - sourceSets.main.output.resourcesDir.toPath().toString(), - sourceSets.api.output.resourcesDir.toPath().toString(), - ] - for (final def file in sourceSets.main.output.classesDirs.getFiles()) { - paths.add(file.toPath().toString()) - } - for (final def file in sourceSets.api.output.classesDirs.getFiles()) { - paths.add(file.toPath().toString()) - } - String.join(File.pathSeparator, paths) - } - lazyToken 'classpathInclude', { - def paths = [project.buildDir.toPath().resolve("run_classes").toString()] - String.join(File.pathSeparator, paths) - } - - mods { - logisticspipes { - sources = [sourceSets.api, sourceSets.main] - } - } - } - - server { - workingDirectory project.file('run-server') - - // Recommended logging data for a userdev environment - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - - // Recommended logging level for the console - property 'forge.logging.console.level', 'debug' - - // load LP core mod from classpath - property 'fml.coreMods.load', 'logisticspipes.asm.LogisticsPipesCoreLoader' - - jvmArgs '-ea' - environment 'MC_VERSION', mcversion - - lazyToken 'classpathExclude', { - def paths = [ - sourceSets.main.output.classesDirs.asPath, - sourceSets.api.output.classesDirs.asPath, - sourceSets.main.output.resourcesDir.path, - sourceSets.api.output.resourcesDir.path, - ] - String.join(File.pathSeparator, paths) - } - lazyToken 'classpathInclude', { - def paths = ["${project.buildDir}/run_classes/"] - String.join(File.pathSeparator, paths) - } - - mods { - logisticspipes { - sources = [sourceSets.api, sourceSets.main] - } - } - } - - serverTest { - environment 'target', 'server' - // mimic the runServer task - environment 'mainClass', 'net.minecraft.launchwrapper.Launch' - environment 'MCP_TO_SRG', "$buildDir/createSrgToMcp/output.srg" - environment 'MC_VERSION', mcversion - main 'net.minecraftforge.legacydev.MainServer' - args '--tweakClass', 'net.minecraftforge.fml.common.launcher.FMLServerTweaker' - arg 'nogui' // without GUI - jvmArg '-ea' - workingDirectory project.file('run-server-test') - - // load LP core mod from classpath - property 'fml.coreMods.load', 'logisticspipes.asm.LogisticsPipesCoreLoader' - - // put LP in test mode - property 'logisticspipes.test', 'true' - property 'logisticspipes.test.debug', 'false' // set this to true in the generated run configuration - - lazyToken 'classpathExclude', { - def paths = [ - sourceSets.main.output.classesDirs.asPath, - sourceSets.api.output.classesDirs.asPath, - sourceSets.main.output.resourcesDir.path, - sourceSets.api.output.resourcesDir.path, - ] - String.join(File.pathSeparator, paths) - } - lazyToken 'classpathInclude', { - def paths = [ - "${project.buildDir}/run_classes/", - sourceSets.test.output.classesDirs.asPath, - sourceSets.test.output.resourcesDir.path, - ] - // sorry for the mess in the run configuration's classpath, - // but using the test classpath included the dependencies from the provided scope - for (final def file in configurations.testRuntimeClasspath.resolvedConfiguration.files) { - paths.add(file.toPath().toString()) - } - String.join(File.pathSeparator, paths) - } - - mods { - logisticspipes { - sources = [sourceSets.api, sourceSets.main, sourceSets.test] - } + // Add various JVM arguments here for runtime + def args = ['-ea:' + group] + if (propertyBool('is_coremod')) { + args << '-Dfml.coreMods.load=' + propertyString('coremod_plugin_class_name') + } + if (propertyBool('use_mixins')) { + args << '-Dmixin.hotSwap=true' + args << '-Dmixin.checks.interfaces=true' + args << '-Dmixin.debug.export=true' + } + extraRunJvmArguments.addAll(args) + extraRunJvmArguments.addAll(propertyStringList('extra_jvm_args')) + + if (propertyBool('use_tags')) { + if (file('tags.properties').exists()) { + Properties props = new Properties().tap { it.load(file('tags.properties').newInputStream()); it } + if (!props.isEmpty()) { + injectedTags.set(props.collectEntries { k, v -> [(k): interpolate(v)] }) } } } } -jar { - from sourceSets.api.output - finalizedBy 'shadowJar' - duplicatesStrategy = DuplicatesStrategy.WARN - - manifest = project.manifest { - from sharedManifest +repositories { + maven { + name 'CleanroomMC Maven' + url 'https://maven.cleanroommc.com' } } -shadowJar { - from sourceSets.api.output - finalizedBy 'reobfJar' - - archiveClassifier.set('') - - dependencies { - include(dependency(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version)) - include(dependency(group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version)) - include(dependency(group: 'org.jetbrains', name: 'annotations', version: kannotations_version)) - include(dependency(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core-jvm', version: kcoroutines_version)) - include(dependency(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: kcoroutines_version)) - include(dependency(group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-json-jvm', version: kserialization_version)) - include(dependency(group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-core-jvm', version: kserialization_version)) - include(dependency(group: 'com.charleskorn.kaml', name: 'kaml-jvm', version: kaml_version)) - include(dependency(group: 'org.snakeyaml', name: 'snakeyaml-engine', version: '2.3')) +dependencies { + if (propertyBool('use_modern_java_syntax')) { + annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // Workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' + compileOnly ('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { + transitive = false + } + // Allow jdk.unsupported classes like sun.misc.Unsafe, workaround for JDK-8206937 and fixes crashes in tests + patchedMinecraft 'me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0' + // Include for tests + testAnnotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + testCompileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { + transitive = false // We only care about the 1 annotation class + } } - - relocate 'kotlin', 'logisticspipes.kotlin' - relocate 'kotlinx', 'logisticspipes.kotlinx' - relocate 'org.intellij', 'logisticspipes.intellij' - relocate 'org.jetbrains', 'logisticspipes.jetbrains' - relocate 'org.snakeyaml', 'logisticspipes.snakeyaml' - relocate 'com.charleskorn.kaml', 'logisticspipes.kaml' - - exclude 'META-INF/versions/9/*' - exclude 'DebugProbesKt.bin' - - manifest { - inheritFrom sharedManifest + if (propertyBool('use_asset_mover')) { + implementation "com.cleanroommc:assetmover:${propertyString('asset_mover_version')}" + } + if (propertyBool('use_mixins')) { + String mixin = modUtils.enableMixins("zone.rong:mixinbooter:${propertyString('mixin_booter_version')}", propertyString('mixin_refmap')) + api (mixin) { + transitive = false + } + annotationProcessor 'org.ow2.asm:asm-debug-all:5.2' + annotationProcessor 'com.google.guava:guava:24.1.1-jre' + annotationProcessor 'com.google.code.gson:gson:2.8.6' + annotationProcessor (mixin) { + transitive = false + } } } -task sourceJar(type: Jar) { - from sourceSets.api.allSource - from sourceSets.main.allSource - archiveClassifier.set('sources') -} +apply from: 'gradle/scripts/dependencies.gradle' -test { - reports { - html.required.set(true) +// Adds Access Transformer files to tasks +if (propertyBool('use_access_transformer')) { + for (def location : propertyStringList('access_transformer_locations')) { + def fileLocation = file("${projectDir}/src/main/resources/${location}") + if (fileLocation.exists()) { + tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(fileLocation) + tasks.srgifyBinpatchedJar.accessTransformerFiles.from(fileLocation) + } else { + throw new GradleException("Access Transformer file [$fileLocation] does not exist!") + } } } processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - - duplicatesStrategy = DuplicatesStrategy.FAIL - - // replace stuff in mcmod.info, nothing else - from(project.file('resources_raw')) { - include 'mcmod.info' - - // replace version and mcversion - expand 'version': project.version, 'mcversion': mcversion + filesMatching(['mcmod.info', 'pack.mcmeta', 'mixins.*(?!refmap).*\\.json']) { + def authors = propertyString('mod_authors').split(',').collect { """\"${ it.trim() }\"""" }.join(', ') + expand( + 'mod_id': propertyString('mod_id'), + 'mod_name': propertyString('mod_name'), + 'mod_version': propertyString('mod_version'), + 'mod_description': propertyString('mod_description'), + 'mod_authors': "[${authors}]", + 'mod_credits': propertyString('mod_credits'), + 'mod_url': propertyString('mod_url'), + 'mod_update_json': propertyString('mod_update_json'), + 'mod_logo_path': propertyString('mod_logo_path'), + 'mixin_refmap': propertyString('mixin_refmap'), + 'mixin_package': propertyString('mixin_package') + ) } -} - -repositories { - mavenCentral() - maven { - url = "https://maven.removeco.de/" + + if (propertyBool('use_access_transformer')) { + rename '(.+_at.cfg)', 'META-INF/$1' } + } -dependencies { - minecraft group: 'net.minecraftforge', name: 'forge', version: forge_version - apiImplementation group: 'net.minecraftforge', name: 'forge', version: forge_version - dummyImplementation group: 'net.minecraftforge', name: 'forge', version: forge_version - - implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version - implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version - implementation group: 'org.jetbrains', name: 'annotations', version: kannotations_version - implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: kcoroutines_version - implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: kcoroutines_version - implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-json', version: kserialization_version - implementation group: 'com.charleskorn.kaml', name: 'kaml', version: kaml_version - implementation group: 'com.github.RS485', name: 'CodeChickenLib', version: '5901b4c6f4af70e6ef2dbe194bf7e0e097bb375c', classifier: 'deobf' - - compileOnly group: 'mcjty.theoneprobe', name: 'TheOneProbe-1.12', version: '1.12-1.4.28-17', classifier: 'api' - compileOnly group: 'mezz.jei', name: 'jei_1.12.2', version: '4.15.0.293' - compileOnly group: 'MCMultiPart2', name: 'MCMultiPart', version: '2.5.4', classifier: 'deobf' - compileOnly group: 'com.mod-buildcraft', name: 'buildcraft-all', version: '7.99.24.6', transitive: false - compileOnly group: 'net.industrial-craft', name: 'industrialcraft-2', version: '2.8.170-ex112', classifier: 'api' - compileOnly group: 'codechicken', name: 'NotEnoughItems', version: '1.12.2-2.4.3.245', classifier: 'deobf', transitive: false - compileOnly group: 'codechicken', name: 'EnderStorage', version: '1.12.2-2.4.6.137', classifier: 'deobf', transitive: false - compileOnly group: 'li.cil.oc', name: 'OpenComputers', version: 'MC1.12.2-1.7.5.205', classifier: 'api' - compileOnly files('lib/appliedenergistics2-rv6-stable-7-api.jar') - compileOnly group: 'cofh', name: 'CoFHCore', version: '1.12.2-4.6.3.27', classifier: 'deobf', transitive: false - compileOnly group: 'cofh', name: 'RedstoneFlux', version: '1.12-2.1.0.7', classifier: 'deobf', transitive: false - compileOnly group: 'cofh', name: 'CoFHWorld', version: '1.12.2-1.2.0.5', classifier: 'deobf', transitive: false - compileOnly group: 'cofh', name: 'ThermalDynamics', version: '1.12.2-2.5.5.21', classifier: 'deobf', transitive: false - compileOnly group: 'cofh', name: 'ThermalFoundation', version: '1.12.2-2.6.3.27', classifier: 'deobf', transitive: false - compileOnly group: 'cofh', name: 'ThermalExpansion', version: '1.12.2-5.5.4.43', classifier: 'deobf', transitive: false - compileOnly group: 'org.squiddev', name: 'cc-tweaked-1.12.2', version: '1.89.2', transitive: false - compileOnly group: 'com.jaquadro.minecraft.storagedrawers', name: 'StorageDrawers', version: '1.12.2-5.4.2', transitive: false - compileOnly group: 'pl.asie.charset', name: 'Charset', version: '0.5.6.6', classifier: 'api', transitive: false - - ktlint("com.pinterest:ktlint:0.47.1") { - attributes { - attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL)) +jar { + manifest { + def attribute_map = [:] + if (propertyBool('is_coremod')) { + attribute_map['FMLCorePlugin'] = propertyString('coremod_plugin_class_name') + if (propertyBool('coremod_includes_mod')) { + attribute_map['FMLCorePluginContainsFMLMod'] = true + def currentTasks = gradle.startParameter.taskNames + if (currentTasks[0] == 'build' || currentTasks[0] == 'prepareObfModsFolder' || currentTasks[0] == 'runObfClient') { + attribute_map['ForceLoadAsMod'] = true + } + } + } + if (propertyBool('use_access_transformer')) { + attribute_map['FMLAT'] = propertyString('access_transformer_locations') } + attributes(attribute_map) } - - testImplementation 'org.jetbrains.kotlin:kotlin-test' - testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5' - testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' } - -import net.minecraftforge.gradle.userdev.MinecraftUserRepo - -import java.nio.file.Files - -final nonMinecraftConfigurations = configurations.findAll { conf -> conf != configurations.minecraft } -if (!nonMinecraftConfigurations.empty) { - final fgextension = project.getExtensions().findByName("minecraft") - final mcrepo = new MinecraftUserRepo( - /* project = */ project, - /* group = */ 'net.minecraftforge', - /* name = */ 'forge', - /* version = */ "$forge_version", - /* ats = */ fgextension.getAccessTransformers().getFrom().toList(), - /* mapping = */ fgextension.getMappings().get(), - ) - nonMinecraftConfigurations.each { - it.resolutionStrategy.dependencySubstitution { - substitute module('net.minecraftforge:forge') using module(mcrepo.getDependencyString()) +idea { + module { + inheritOutputDirs = true + } + project { + settings { + runConfigurations { + "1. Run Client"(Gradle) { + taskNames = ["runClient"] + } + "2. Run Server"(Gradle) { + taskNames = ["runServer"] + } + "3. Run Obfuscated Client"(Gradle) { + taskNames = ["runObfClient"] + } + "4. Run Obfuscated Server"(Gradle) { + taskNames = ["runObfServer"] + } + } + compiler.javac { + afterEvaluate { + javacAdditionalOptions = "-encoding utf8" + moduleJavacAdditionalOptions = [ + (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') + ] + } + } } } } -task ktlint(type: JavaExec, group: "verification") { - description = "Check Kotlin code style." - classpath = configurations.ktlint - mainClass.set("com.pinterest.ktlint.Main") - args "**/*.kt" +compileTestJava { + sourceCompatibility = targetCompatibility = 8 } -//check.dependsOn ktlint // not enforced, ktlint is in trial mode -clean { - // this folder is created by dependency resolution and will be created before 'clean' runs, - // resulting in missing minecraft sources etc. Set here: https://fckaf.de/voZ - setDelete(project.fileTree("$buildDir") { - exclude 'fg_cache' +test { + javaLauncher.set(javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) }) } -tasks.withType(Test) { - useJUnitPlatform() - testLogging { - events("passed", "skipped", "failed") - } +changelog { + header.set("[${propertyString('mod_version')}] - ${LocalDate.now().format("yyyy-MM-dd")}") + headerParserRegex.set(~/(\d+\.\d+)/) } -task deobfJar(type: Jar) { - from sourceSets.main.output - from sourceSets.api.output - archiveClassifier.set('deobf') - duplicatesStrategy = DuplicatesStrategy.WARN +if (propertyBool('spotless')) { + apply plugin: 'com.diffplug.spotless' + // noinspection GroovyAssignabilityCheck + spotless { + encoding 'UTF-8' + format 'misc', { + target '.gitignore' - manifest = project.manifest { - from sharedManifest - } -} - -task apiJar(type: Jar, dependsOn: apiClasses) { - from sourceSets.api.output - from sourceSets.api.allSource - archiveClassifier.set('api') - duplicatesStrategy = DuplicatesStrategy.WARN -} - -curseforge { - apiKey = project.hasProperty('LogisticsPipes.curseForgeApiKey') ? project.findProperty("LogisticsPipes.curseForgeApiKey") : '0' - project { - id = "232838" - changelog = project.hasProperty('changelog') ? project.findProperty('changelog') : '' - releaseType = 'beta' - relations { - requiredDependency 'codechicken-lib-1-8' + endWithNewline() + indentWithSpaces() + trimTrailingWhitespace() } + java { + target 'src/main/java/**/*.java', 'src/test/java/**/*.java' + + endWithNewline() + formatAnnotations() + importOrder() + indentWithSpaces() + removeUnusedImports() + toggleOffOn() + trimTrailingWhitespace() + + if (propertyBool('cleanthat')) { + cleanthat().sourceCompatibility('1.8') + } + } + json { + target 'src/main/resources/**/*.json', 'src/test/resources/**/*.json' - mainArtifact(shadowJar) { - displayName = "Logistics Pipes $project.version" + simple().indentWithSpaces(6) } } } -artifacts { - archives apiJar - archives shadowJar - archives deobfJar - archives sourceJar +tasks.register('generateMixinJson') { + group 'cleanroom helpers' + onlyIf { + if (propertyBool('use_mixins') && propertyBool('generate_mixins_json')) { + return !file("src/main/resources/mixins.${propertyString('mod_id')}.json").exists() + } + return false + } + doLast { + def file = file("src/main/resources/mixins.${propertyString('mod_id')}.json") + file << """{\n\t"package": "\${mixin_package}",\n\t"required": true,\n\t"refmap": "\${mixin_refmap}",\n\t"target": "@env(DEFAULT)",\n\t"minVersion": "0.8.5",\n\t"compatibilityLevel": "JAVA_8",\n\t"mixins": [],\n\t"server": [],\n\t"client": []\n}""" + } } -task enableSigningTasks { - doFirst { - tasks.withType(Sign) { - enabled = true +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + if (propertyBool('use_modern_java_syntax')) { + if (it.name in ['compileMcLauncherJava', 'compilePatchedMcJava']) { + return } + sourceCompatibility = 17 + options.release.set(8) + javaCompiler.set(javaToolchains.compilerFor { + languageVersion.set(JavaLanguageVersion.of(16)) + vendor.set(JvmVendorSpec.AZUL) + }) } } -signing { - useGpgCmd() - sign apiJar - sign shadowJar - sign deobfJar - sign sourceJar +tasks.withType(KotlinCompile).configureEach { + kotlinOptions { + languageVersion = "1.7" + jvmTarget = JavaVersion.VERSION_1_8 + freeCompilerArgs += "-Xjvm-default=all" + } } -task sign { - dependsOn enableSigningTasks - dependsOn(tasks.withType(Sign)) +tasks.register('cleanroomAfterSync') { + group 'cleanroom helpers' + dependsOn 'injectTags', 'generateMixinJson' } -tasks.withType(Sign) { - // disable signing by default - enabled = false - mustRunAfter enableSigningTasks - // sign all jars, except the source jar – it doesn't have classes - ext.useJarsigner = (name.toLowerCase().endsWith("jar") && name != "signSourceJar") +if (propertyBool('use_modern_java_syntax')) { + tasks.withType(Javadoc).configureEach { + sourceCompatibility = 17 + } } -gradle.taskGraph.whenReady { TaskExecutionGraph taskGraph -> - taskGraph.allTasks.each { Task task -> - if (task instanceof Sign && task.useJarsigner) { - task.doFirst { - task.filesToSign.each { File file -> - // see https://ant.apache.org/manual/Tasks/signjar.html for arguments - // ForgeGradle also uses ant.signjar: https://fckaf.de/DCw - println "$task – signing $file with ant.signjar" - task.ant.signjar( - jar: file, - alias: "1", - storetype: findProperty("LogisticsPipes.storetype"), - keystore: findProperty("LogisticsPipes.keystore"), - storepass: findProperty("LogisticsPipes.storepass"), - verbose: "true", - preservelastmodified: "true" - ) - } - } - } else if (task.name.startsWith('prepareRunServerTest')) { - task.doFirst { - final def serverTestHome = projectDir.toPath().resolve('run-server-test') - if (findProperty("acceptMinecraftServerEula") == 'true') { - def eulaFile = serverTestHome.resolve('eula.txt') - Files.deleteIfExists(eulaFile) - eulaFile.write('eula=true') - } - - final serverProperties = serverTestHome.resolve('server.properties') - def properties = new Properties() - try { - serverProperties.withReader {reader -> - properties.load(reader) - } - } catch (IOException e) { - println "Error reading $serverProperties" - e.printStackTrace() - } - properties.setProperty('spawn-monsters', 'false') - properties.setProperty('spawn-npcs', 'false') - properties.setProperty('spawn-animals', 'false') - properties.setProperty('generate-structures', 'false') - properties.setProperty('online-mode', 'false') - properties.setProperty('gamemode', '1') - properties.setProperty('level-type', 'FLAT') - properties.setProperty('generator-settings', '3;minecraft:bedrock,3*minecraft:stone,96*minecraft:sandstone;2;') - properties.setProperty('motd', 'Logistics Pipes Test Server') - //properties.setProperty('max-tick-time', '0') // for debugging the server - try { - serverProperties.withWriter {writer -> - properties.store(writer, null) - } - } catch (IOException e) { - println "Error reading $serverProperties" - e.printStackTrace() - } - } - } +tasks.named('injectTags', InjectTagsTask).configure { + onlyIf { + return propertyBool('use_tags') && !it.getTags().get().isEmpty() } + it.outputClassName.set(propertyString('tag_class_name')) } -abstract class DownloadTask extends DefaultTask { - @Input - String url - - @OutputFile - final RegularFileProperty outputFile = project.objects.fileProperty() - - @TaskAction - void download() { - ant.get(src: url, dest: outputFile.get().asFile) +idea.project.settings { + taskTriggers { + afterSync 'cleanroomAfterSync' } } -task downloadLanguage(type: DownloadTask) { - url = "https://github.com/RS485/LogisticsPipes-Language/archive/master.zip" - outputFile.set(layout.buildDirectory.file("language.zip")) +tasks.register('ktlint', JavaExec) { + description = "Check Kotlin code style." + classpath = configurations.ktlint + mainClass.set("com.pinterest.ktlint.Main") + args "**/*.kt" } +//check.dependsOn ktlint // not enforced, ktlint is in trial mode -task languageMain(dependsOn: downloadLanguage, type: Copy) { - from zipTree(downloadLanguage.outputFile) - into "${sourceSets.main.getOutput().resourcesDir}/assets/logisticspipes/lang/" - include "*/*.lang" - - includeEmptyDirs false - eachFile { FileCopyDetails fcd -> - fcd.relativePath = new RelativePath(!fcd.isDirectory(), fcd.relativePath.segments.drop(1)) +tasks.named("shadowJar", ShadowJar).configure { + manifest { + inheritFrom jar.manifest } -} -task languageBook(dependsOn: downloadLanguage, type: Copy) { - from zipTree(downloadLanguage.outputFile) - into "${sourceSets.main.getOutput().resourcesDir}/assets/logisticspipes/book/" - include "*/book/" + configurations = [ + project.configurations.shadowImplementation + ] - includeEmptyDirs false - eachFile { FileCopyDetails fcd -> - fcd.relativePath = new RelativePath(!fcd.isDirectory(), fcd.relativePath.segments.drop(2)) - } -} + from sourceSets.api.output -task language(dependsOn: [languageMain, languageBook], type: Copy) { - processResources.dependsOn language -} + archiveClassifier.set('dev') -tasks.named('wrapper') { - gradleVersion = '7.5' - distributionType = Wrapper.DistributionType.ALL -} + relocate 'kotlin', 'logisticspipes.kotlin' + relocate 'kotlinx', 'logisticspipes.kotlinx' + relocate 'org.intellij', 'logisticspipes.intellij' + relocate 'org.jetbrains', 'logisticspipes.jetbrains' + relocate 'org.snakeyaml', 'logisticspipes.snakeyaml' + relocate 'com.charleskorn.kaml', 'logisticspipes.kaml' -tasks.withType(AbstractArchiveTask) { - preserveFileTimestamps = false - reproducibleFileOrder = true + exclude 'META-INF/versions/9/*' + exclude 'DebugProbesKt.bin' } -task integrationTests(dependsOn: ['prepareRunServerTest'], type: Exec) { - workingDir projectDir +configurations.runtimeElements.outgoing.artifacts.clear() +configurations.apiElements.outgoing.artifacts.clear() +configurations.runtimeElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) +configurations.apiElements.outgoing.artifact(tasks.named("shadowJar", ShadowJar)) - commandLine "$projectDir/gradlew" - args '--no-daemon', '--stacktrace', 'runServerTest' - ignoreExitValue = true - - standardOutput = new ByteArrayOutputStream() - errorOutput = standardOutput // redirect stderr to stdout - - doFirst { - if (System.properties['os.name'].toLowerCase().contains('windows')) { - commandLine = ["cmd", "/c", "$projectDir/gradlew.bat"] + args - } - } +tasks.named("jar", Jar) { + from sourceSets.api.output - doLast { - final output = standardOutput.toString() - final start = output.indexOf('[STARTING LOGISTICSPIPES TESTS]') - if (start == -1) throw new GradleException("Cannot find LP test start:\n${output}") - final logStart = output.substring(0, start).lastIndexOf('\n') + 1 - def testOutput = output.substring(logStart) - final end = testOutput.indexOf('Attempting to read last messages from the daemon log') - if (end != -1) { - // remove double output from daemon log - testOutput = testOutput.substring(0, end) - } - if (testOutput.contains('[FAILED]')) { - throw new GradleException("Error in LP Tests:\n${testOutput}") - } else { - testOutput.eachLine { - if (it.contains('[STARTING LOGISTICSPIPES TESTS]') || - it.contains('[PASSED]') || - it.contains('[SKIPPED]')) { - println(it) - } - } - } - } + enabled = false + finalizedBy(tasks.shadowJar) } -publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://${project.projectDir}/mcmodsrepo" - } - } +tasks.named("reobfJar", ReobfuscatedJar) { + inputJar.set(tasks.named("shadowJar", ShadowJar).flatMap({it.archiveFile})) } -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +AdhocComponentWithVariants javaComponent = (AdhocComponentWithVariants) project.components.findByName("java") +javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { + skip() } + +ext.publishableDevJar = tasks.shadowJar +ext.publishableObfJar = tasks.reobfJar + +apply from: 'gradle/scripts/publishing.gradle' +apply from: 'gradle/scripts/extra.gradle' diff --git a/common/logisticspipes/pipes/PipeFluidExtractor.java b/common/logisticspipes/pipes/PipeFluidExtractor.java deleted file mode 100644 index 9b23442547..0000000000 --- a/common/logisticspipes/pipes/PipeFluidExtractor.java +++ /dev/null @@ -1,74 +0,0 @@ -package logisticspipes.pipes; - -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import net.minecraftforge.fluids.FluidStack; - -import logisticspipes.interfaces.ITankUtil; -import logisticspipes.textures.Textures; -import logisticspipes.textures.Textures.TextureType; -import logisticspipes.transport.PipeFluidTransportLogistics; -import logisticspipes.utils.FluidIdentifierStack; - -public class PipeFluidExtractor extends PipeFluidInsertion { - - private int[] liquidToExtract = new int[6]; - - private static final int flowRate = 500; - private static final int energyPerFlow = 5; - - public PipeFluidExtractor(Item item) { - super(item); - } - - @Override - public void enabledUpdateEntity() { - super.enabledUpdateEntity(); - if (!isNthTick(10)) { - return; - } - PipeFluidUtil.INSTANCE.getAdjacentTanks(this, false) - .forEach(tankData -> extractFrom(tankData.getValue2(), tankData.getValue1().getDirection())); - } - - private void extractFrom(ITankUtil container, EnumFacing side) { - int sideID = side.ordinal(); - FluidStack contained = ((PipeFluidTransportLogistics) transport).getTankProperties(side)[0].getContents(); - int amountMissing = ((PipeFluidTransportLogistics) transport).getSideCapacity() - (contained != null ? contained.amount : 0); - if (liquidToExtract[sideID] < Math.min(PipeFluidExtractor.flowRate, amountMissing)) { - if (this.useEnergy(PipeFluidExtractor.energyPerFlow)) { - liquidToExtract[sideID] += Math.min(PipeFluidExtractor.flowRate, amountMissing); - } - } - FluidIdentifierStack extracted = container.drain(Math.min(liquidToExtract[sideID], PipeFluidExtractor.flowRate), false); - - int inserted = 0; - if (extracted != null) { - inserted = ((PipeFluidTransportLogistics) transport).fill(side, extracted.makeFluidStack(), true); - container.drain(inserted, true); - } - liquidToExtract[sideID] -= inserted; - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - nbttagcompound.setIntArray("liquidToExtract", liquidToExtract); - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - liquidToExtract = nbttagcompound.getIntArray("liquidToExtract"); - if (liquidToExtract.length < 6) { - liquidToExtract = new int[6]; - } - } - - @Override - public TextureType getCenterTexture() { - return Textures.LOGISTICSPIPE_LIQUID_EXTRACTOR; - } -} diff --git a/common/logisticspipes/pipes/PipeFluidInsertion.java b/common/logisticspipes/pipes/PipeFluidInsertion.java deleted file mode 100644 index 2cc6d78e50..0000000000 --- a/common/logisticspipes/pipes/PipeFluidInsertion.java +++ /dev/null @@ -1,133 +0,0 @@ -package logisticspipes.pipes; - -import java.util.ArrayList; -import java.util.List; -import javax.annotation.Nonnull; - -import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; - -import net.minecraftforge.fluids.FluidStack; - -import logisticspipes.logisticspipes.IRoutedItem; -import logisticspipes.logisticspipes.IRoutedItem.TransportMode; -import logisticspipes.pipes.basic.fluid.FluidRoutedPipe; -import logisticspipes.proxy.SimpleServiceLocator; -import logisticspipes.textures.Textures; -import logisticspipes.textures.Textures.TextureType; -import logisticspipes.transport.PipeFluidTransportLogistics; -import logisticspipes.utils.FluidIdentifierStack; -import logisticspipes.utils.FluidSinkReply; -import logisticspipes.utils.item.ItemIdentifierStack; -import logisticspipes.utils.tuples.Pair; - -public class PipeFluidInsertion extends FluidRoutedPipe { - - private final List> localJamList = new ArrayList<>(); - private int[] nextSendMax = new int[EnumFacing.VALUES.length]; - private int[] nextSendMin = new int[EnumFacing.VALUES.length]; - - public PipeFluidInsertion(Item item) { - super(item); - } - - @Override - public void enabledUpdateEntity() { - super.enabledUpdateEntity(); - List tempJamList = new ArrayList<>(); - if (!localJamList.isEmpty()) { - List> toRemove = new ArrayList<>(); - for (Pair part : localJamList) { - part.setValue2(part.getValue2() - 1); - if (part.getValue2() <= 0) { - toRemove.add(part); - } else { - tempJamList.add(part.getValue1()); - } - } - if (!toRemove.isEmpty()) { - localJamList.removeAll(toRemove); - } - } - PipeFluidTransportLogistics transport = (PipeFluidTransportLogistics) this.transport; - for (EnumFacing dir : EnumFacing.VALUES) { - FluidStack stack = transport.sideTanks[dir.ordinal()].getFluid(); - if (stack == null) { - continue; - } - stack = stack.copy(); - - if (nextSendMax[dir.ordinal()] > 0 && stack.amount < transport.sideTanks[dir.ordinal()].getCapacity()) { - nextSendMax[dir.ordinal()]--; - continue; - } - if (nextSendMin[dir.ordinal()] > 0) { - nextSendMin[dir.ordinal()]--; - continue; - } - - Pair result = SimpleServiceLocator.logisticsFluidManager.getBestReply(FluidIdentifierStack.getFromStack(stack), getRouter(), tempJamList); - if (result == null || result.getValue2().sinkAmount <= 0) { - nextSendMax[dir.ordinal()] = 100; - nextSendMin[dir.ordinal()] = 10; - continue; - } - - if (!useEnergy((int) (0.01 * result.getValue2().getSinkAmountInt()))) { - nextSendMax[dir.ordinal()] = 100; - nextSendMin[dir.ordinal()] = 10; - continue; - } - - FluidStack toSend = transport.sideTanks[dir.ordinal()].drain(result.getValue2().getSinkAmountInt(), true); - ItemIdentifierStack liquidContainer = SimpleServiceLocator.logisticsFluidManager.getFluidContainer(FluidIdentifierStack.getFromStack(toSend)); - IRoutedItem routed = SimpleServiceLocator.routedItemHelper.createNewTravelItem(liquidContainer); - routed.setDestination(result.getValue1()); - routed.setTransportMode(TransportMode.Passive); - this.queueRoutedItem(routed, dir); - nextSendMax[dir.ordinal()] = 100; - nextSendMin[dir.ordinal()] = 5; - } - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound tag) { - super.writeToNBT(tag); - tag.setIntArray("nextSendMax", nextSendMax); - tag.setIntArray("nextSendMin", nextSendMin); - } - - @Override - public void readFromNBT(@Nonnull NBTTagCompound tag) { - super.readFromNBT(tag); - nextSendMax = tag.getIntArray("nextSendMax"); - if (nextSendMax.length < 6) { - nextSendMax = new int[6]; - } - nextSendMin = tag.getIntArray("nextSendMin"); - if (nextSendMin.length < 6) { - nextSendMin = new int[6]; - } - } - - @Override - public TextureType getCenterTexture() { - return Textures.LOGISTICSPIPE_LIQUID_INSERTION; - } - - @Override - public boolean canInsertToTanks() { - return false; - } - - @Override - public boolean canInsertFromSideToTanks() { - return false; - } - - @Override - public boolean canReceiveFluid() { - return true; - } -} diff --git a/gradle.properties b/gradle.properties index e080e302a4..f75e51e587 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,133 @@ -# Sets default memory used for gradle commands. Can be overridden by user or command line properties. -# This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +# Gradle Properties +org.gradle.jvmargs = -Xmx3G + +# Source Options +# Use Modern Java(9+) Syntax (Courtesy of Jabel) +use_modern_java_syntax = false +# Spotless automatically refactors your project from java code to jsons for a tidied, uniformed look +spotless = false +# Spotless Options +# CleanThat is a utility part of Spotless that refactors java code with more performant and cleaner code +cleanthat = false + +# Compilation Options +generate_sources_jar = true +generate_javadocs_jar = false + +# Mod Information +# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/ +mod_version = 0.10.4 +root_package = network.rs485 +mod_id = logisticspipes +mod_name = Logistics Pipes + +# Mod Metadata (Optional) +mod_description = Logistics Pipes is an extensive overhaul of the Buildcraft pipe system. It allows for better distribution of items via pipes, more organised stockkeeping and easier automated crafting. +mod_url = https://github.com/RS485/LogisticsPipes +mod_update_json = +# Delimit authors with commas +mod_authors = RS485, LP Team +mod_credits = Contributors: https://github.com/RS485/LogisticsPipes/contributors. Original code and idea made by Krapht. Thanks! +mod_logo_path = + +# Mapping Properties +mapping_channel = stable +mapping_version = 39 +use_dependency_at_files = true + +# Run Configurations +# If multiple arguments/tweak classes are stated, use spaces as the delimiter +minecraft_username = Developer +extra_jvm_args = +extra_tweak_classes = + +# Maven Publishing (Provide secret: MAVEN_USER, MAVEN_PASS) +publish_to_maven = false +# Good for debugging artifacts before uploading to remote maven +# GitHub actions won't run if this is true, test this by running the task `publishToMavenLocal` +publish_to_local_maven = false +maven_name = ${mod_name} +maven_url = + +# Publishing +# release_type can only be: release, beta or alpha (applies to CurseForge / Modrinth) +release_type = release +publish_with_changelog = ${{ it.file('CHANGELOG.md').exists() }} + +# Publishing to CurseForge (Provide secret: CURSEFORGE_TOKEN) +# To configure dependencies, head to publishing.gradle's curseforge block +publish_to_curseforge = false +# CurseForge project ID must be the numerical ID and not the slug +curseforge_project_id = +curseforge_debug = false + +# Publishing to Modrinth (Provide secret: MODRINTH_TOKEN), the token must have the `CREATE_VERSION` and `PROJECT_WRITE` permissions +# To configure dependencies, head to publishing.gradle's modrinth block +publish_to_modrinth = false +modrinth_project_id = +# Allows gradle to publish updated READMEs to the project body (via the modrinthSyncBody task) +modrinth_sync_readme = false +modrinth_debug = false + +# If any properties changes below this line, refresh gradle again to ensure everything is working correctly. + +# Kotlin kotlin_version = 1.7.10 kannotations_version = 23.0.0 kcoroutines_version = 1.6.4 kserialization_version = 1.4.0 kaml_version = 0.47.0 -shadow_version = 6.1.0 -mcversion = 1.12.2 -forge_version = 1.12.2-14.23.5.2860 -mappings_version = 20171120-1.12 -forgegradle_version = 5.1.61 -cursegradle_version = 1.4.0 + +# Utils lombok_plugin_version = 5.3.3.3 +shadow_version = 8.1.1 + +# Modify Minecraft Sources +# RetroFuturaGradle allows Minecraft sources to be edited, and have the changes reflected upon running it +# Good for previews when coremodding, or generally seeing how behaviours can change with certain code applied/unapplied +# Turning this on allows Minecraft sources to persist and not regenerate +change_minecraft_sources = false + +# Tags +# A RetroFuturaGradle concept akin to Ant ReplaceTokens +# A class is generated at build-time for compilation, to describe properties that have values that could change at build time such as versioning +# Class name is configurable with the `tag_class_name` property +# Tag properties can be stated in the `tags.properties` file, references are allowed +use_tags = false +tag_class_name = ${root_package}.${mod_id}.Tags + +# Access Transformers +# A way to change visibility of Minecraft's classes, methods and fields +# An example access transformer file is given in the path: `src/main/resources/example_at.cfg` +# AT files should be in the root of src/main/resources with the filename formatted as: `mod_id_at.cfg` +# Use the property `access_transformer_locations` to state custom AT files if you aren't using the default `mod_id_at.cfg` location +# If multiple locations are stated, use spaces as the delimiter +use_access_transformer = true +access_transformer_locations = lp_at.cfg + +# Mixins +# Powerful tool to do runtime description changes of classes +# Wiki: https://github.com/SpongePowered/Mixin/wiki + https://github.com/CleanroomMC/MixinBooter/ +# Only use mixins once you understand the underlying structure +# A refmap is a json that denotes mapping conversions, this json is generated automatically, with the name `mixins.mod_id.refmap.json` +# Use the property `mixin_refmap` if you want it to use a different name, only one name is accepted +use_mixins = false +generate_mixins_json = false +mixin_booter_version = 8.6 +mixin_package = ${root_package}.${mod_id}.mixin +mixin_refmap = mixins.${mod_id}.refmap.json + +# Coremods +# The most powerful way to change java classes at runtime, it is however very primitive with little documentation. +# Only make a coremod if you are absolutely sure of what you are doing +# Change the property `coremod_includes_mod` to false if your coremod doesn't have a @Mod annotation +# You MUST state a class name for `coremod_plugin_class_name` if you are making a coremod, the class should implement `IFMLLoadingPlugin` +is_coremod = true +coremod_includes_mod = true +coremod_plugin_class_name = logisticspipes.asm.LogisticsPipesCoreLoader + +# AssetMover +# Convenient way to allow downloading of assets from official vanilla Minecraft servers, CurseForge, or any direct links +# Documentation: https://github.com/CleanroomMC/AssetMover +use_asset_mover = false +asset_mover_version = 2.5 diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle new file mode 100644 index 0000000000..2466a8b4c1 --- /dev/null +++ b/gradle/scripts/dependencies.gradle @@ -0,0 +1,93 @@ +apply from: 'gradle/scripts/helpers.gradle' + +repositories { + // Other repositories described by default: + // CleanroomMC: https://maven.cleanroommc.com + mavenCentral() + exclusiveContent { + forRepository { + maven { + name 'CurseMaven' + url 'https://cursemaven.com' + } + } + filter { + includeGroup 'curse.maven' + } + } + exclusiveContent { + forRepository { + maven { + name 'Modrinth' + url 'https://api.modrinth.com/maven' + } + } + filter { + includeGroup 'maven.modrinth' + } + } + maven { + url = "https://maven.removeco.de/" + } + maven { + name "Ellpeck" + url "https://maven.ellpeck.de" + } + maven { + url 'https://jitpack.io' + } + mavenLocal() // Must be last for caching to work +} + +dependencies { + if (project.use_mixins.toBoolean()) { + String mixinDep = modUtils.enableMixins('zone.rong:mixinbooter:8.4') + api (mixinDep) {transitive = false} + annotationProcessor('org.ow2.asm:asm-debug-all:5.2') + annotationProcessor('com.google.guava:guava:24.1.1-jre') + annotationProcessor('com.google.code.gson:gson:2.8.6') + annotationProcessor (mixinDep) {transitive = false} + } + + dummyCompileOnly 'com.google.code.findbugs:jsr305:2.0.1' + + shadowImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: kotlin_version + shadowImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlin_version + shadowImplementation group: 'org.jetbrains', name: 'annotations', version: kannotations_version + shadowImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: kcoroutines_version + shadowImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-jdk8', version: kcoroutines_version + shadowImplementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-serialization-json', version: kserialization_version + shadowImplementation group: 'com.charleskorn.kaml', name: 'kaml', version: kaml_version + + implementation 'curse.maven:CodeChickenLib-242818:2779848' + api rfg.deobf('curse.maven:AE2Unofficial-570458:4632516') // v0.53.4 + + compileOnly group: 'mcjty.theoneprobe', name: 'TheOneProbe-1.12', version: '1.12-1.4.28-17', classifier: 'api' + compileOnly group: 'mezz.jei', name: 'jei_1.12.2', version: '4.15.0.293' + compileOnly group: 'MCMultiPart2', name: 'MCMultiPart', version: '2.5.4', classifier: 'deobf' + compileOnly group: 'com.mod-buildcraft', name: 'buildcraft-all', version: '7.99.24.6', transitive: false + compileOnly group: 'net.industrial-craft', name: 'industrialcraft-2', version: '2.8.170-ex112', classifier: 'api' + compileOnly group: 'codechicken', name: 'NotEnoughItems', version: '1.12.2-2.4.3.245', classifier: 'deobf', transitive: false + compileOnly group: 'codechicken', name: 'EnderStorage', version: '1.12.2-2.4.6.137', classifier: 'deobf', transitive: false + compileOnly group: 'li.cil.oc', name: 'OpenComputers', version: 'MC1.12.2-1.7.5.205', classifier: 'api' + compileOnly group: 'cofh', name: 'CoFHCore', version: '1.12.2-4.6.3.27', classifier: 'deobf', transitive: false + compileOnly group: 'cofh', name: 'RedstoneFlux', version: '1.12-2.1.0.7', classifier: 'deobf', transitive: false + compileOnly group: 'cofh', name: 'CoFHWorld', version: '1.12.2-1.2.0.5', classifier: 'deobf', transitive: false + compileOnly group: 'cofh', name: 'ThermalDynamics', version: '1.12.2-2.5.5.21', classifier: 'deobf', transitive: false + compileOnly group: 'cofh', name: 'ThermalFoundation', version: '1.12.2-2.6.3.27', classifier: 'deobf', transitive: false + compileOnly group: 'cofh', name: 'ThermalExpansion', version: '1.12.2-5.5.4.43', classifier: 'deobf', transitive: false + compileOnly group: 'org.squiddev', name: 'cc-tweaked-1.12.2', version: '1.89.2', transitive: false + compileOnly group: 'com.jaquadro.minecraft.storagedrawers', name: 'StorageDrawers', version: '1.12.2-5.4.2', transitive: false + compileOnly group: 'pl.asie.charset', name: 'Charset', version: '0.5.6.6', classifier: 'api', transitive: false + compileOnly rfg.deobf('curse.maven:CodeChickenLib-242818:2779848') + + ktlint("com.pinterest:ktlint:0.47.1") { + attributes { + attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL)) + } + } + + testImplementation 'org.jetbrains.kotlin:kotlin-test' +// testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5' + testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' +} \ No newline at end of file diff --git a/gradle/scripts/extra.gradle b/gradle/scripts/extra.gradle new file mode 100644 index 0000000000..028558c69c --- /dev/null +++ b/gradle/scripts/extra.gradle @@ -0,0 +1,74 @@ + +// You may write any gradle buildscript component in this file +// This file is automatically applied after build.gradle + dependencies.gradle is ran + +// If you wish to use the default helper methods, uncomment the line below +// apply from: 'gradle/scripts/helpers.gradle' + +kotlinLombok { + lombokConfigurationFile file("lombok.config") +} + +abstract class DownloadTask extends DefaultTask { + @Input + String url + + @OutputFile + final RegularFileProperty outputFile = project.objects.fileProperty() + + @TaskAction + void download() { + ant.get(src: url, dest: outputFile.get().asFile) + } +} + +tasks.register('downloadLanguage', DownloadTask) { + url = "https://github.com/RS485/LogisticsPipes-Language/archive/master.zip" + outputFile.set(layout.buildDirectory.file("language.zip")) +} + +tasks.register('languageMain', Copy) { + dependsOn downloadLanguage + from zipTree(downloadLanguage.outputFile) + into "src/main/resources/assets/logisticspipes/lang/" + include "*/*.lang" + + includeEmptyDirs false + eachFile { FileCopyDetails fcd -> + fcd.relativePath = new RelativePath(!fcd.isDirectory(), fcd.relativePath.segments.drop(1)) + } +} + +tasks.register('languageBook', Copy) { + dependsOn downloadLanguage + from zipTree(downloadLanguage.outputFile) + into "src/main/resources/assets/logisticspipes/book/" + include "*/book/" + + includeEmptyDirs false + eachFile { FileCopyDetails fcd -> + fcd.relativePath = new RelativePath(!fcd.isDirectory(), fcd.relativePath.segments.drop(2)) + } +} + +tasks.register('language', Copy) { + dependsOn 'languageMain', 'languageBook' + processResources.dependsOn language +} + +for (runTask in ["runClient", "runServer"]) { + tasks.named(runTask).configure { + dependsOn("shadowJar") + } +} + +tasks.named("ideVirtualMainClasses").configure { + // Make IntelliJ "Build project" build the mod jars + dependsOn("jar", "reobfJar") +} + +for (runTask in ["runClient", "runServer"]) { + tasks.named(runTask).configure { + extraJvmArgs.add('-Dfml.coreMods.load=logisticspipes.asm.LogisticsPipesCoreLoader') + } +} diff --git a/gradle/scripts/helpers.gradle b/gradle/scripts/helpers.gradle new file mode 100644 index 0000000000..c0bc7da798 --- /dev/null +++ b/gradle/scripts/helpers.gradle @@ -0,0 +1,92 @@ +import groovy.text.SimpleTemplateEngine +import org.codehaus.groovy.runtime.MethodClosure + +ext.propertyString = this.&propertyString as MethodClosure +ext.propertyBool = this.&propertyBool as MethodClosure +ext.propertyStringList = this.&propertyStringList as MethodClosure +ext.interpolate = this.&interpolate as MethodClosure +ext.assertProperty = this.&assertProperty as MethodClosure +ext.assertSubProperties = this.&assertSubProperties as MethodClosure +ext.setDefaultProperty = this.&setDefaultProperty as MethodClosure +ext.assertEnvironmentVariable = this.&assertEnvironmentVariable as MethodClosure + +String propertyString(String key) { + return $property(key).toString() +} + +boolean propertyBool(String key) { + return propertyString(key).toBoolean() +} + +Collection propertyStringList(String key) { + return propertyString(key).split(' ').findAll { !it.isEmpty() } +} + +private Object $property(String key) { + def value = project.findProperty(key) + if (value instanceof String) { + return interpolate(value) + } + return value +} + +String interpolate(String value) { + if (value.startsWith('${{') && value.endsWith('}}')) { + value = value.substring(3, value.length() - 2) + Binding newBinding = new Binding(this.binding.getVariables()) + newBinding.setProperty('it', this) + return new GroovyShell(this.getClass().getClassLoader(), newBinding).evaluate(value) + } + if (value.contains('${')) { + return new SimpleTemplateEngine().createTemplate(value).make(project.properties).toString() + } + return value +} + +void assertProperty(String propertyName) { + def property = property(propertyName) + if (property == null) { + throw new GradleException("Property ${propertyName} is not defined!") + } + if (property.isEmpty()) { + throw new GradleException("Property ${propertyName} is empty!") + } +} + +void assertSubProperties(String propertyName, String... subPropertyNames) { + assertProperty(propertyName) + if (propertyBool(propertyName)) { + for (String subPropertyName : subPropertyNames) { + assertProperty(subPropertyName) + } + } +} + +void setDefaultProperty(String propertyName, boolean warn, defaultValue) { + def property = property(propertyName) + def exists = true + if (property == null) { + exists = false + if (warn) { + project.logger.log(LogLevel.WARN, "Property ${propertyName} is not defined!") + } + } else if (property.isEmpty()) { + exists = false + if (warn) { + project.logger.log(LogLevel.WARN, "Property ${propertyName} is empty!") + } + } + if (!exists) { + project.setProperty(propertyName, defaultValue.toString()) + } +} + +void assertEnvironmentVariable(String propertyName) { + def property = System.getenv(propertyName) + if (property == null) { + throw new GradleException("System Environment Variable $propertyName is not defined!") + } + if (property.isEmpty()) { + throw new GradleException("Property $propertyName is empty!") + } +} \ No newline at end of file diff --git a/gradle/scripts/publishing.gradle b/gradle/scripts/publishing.gradle new file mode 100644 index 0000000000..1b09bde19e --- /dev/null +++ b/gradle/scripts/publishing.gradle @@ -0,0 +1,130 @@ +apply from: 'gradle/scripts/helpers.gradle' + +setDefaultProperty('publish_to_maven', true, false) +setDefaultProperty('publish_to_curseforge', true, false) +setDefaultProperty('publish_to_modrinth', true, false) + +if (propertyBool('publish_to_maven')) { + assertProperty('maven_name') + assertProperty('maven_url') + publishing { + repositories { + maven { + name propertyString('maven_name').replaceAll("\\s", "") + url propertyString('maven_url') + credentials(PasswordCredentials) + } + } + publications { + mavenJava(MavenPublication) { + artifact reobfJar // Publish with shadowed artifacts + setGroupId(propertyString('root_package'))// Publish with root package as maven group + setArtifactId(propertyString('mod_id')) // Publish artifacts with mod id as the artifact id + + // Custom artifact: + // If you want to publish a different artifact to the one outputted when building normally + // Create a different gradle task (Jar task), in extra.gradle + // Remove the 'from components.java' line above + // Add this line (change the task name): + // artifacts task_name + } + } + } +} + +// Documentation here: https://github.com/matthewprenger/CurseGradle/wiki/ +if (propertyBool('publish_to_curseforge')) { + apply plugin: 'com.matthewprenger.cursegradle' + assertEnvironmentVariable('CURSEFORGE_TOKEN') + assertProperty('curseforge_project_id') + assertProperty('release_type') + setDefaultProperty('curseforge_debug', false, false) + curseforge { + apiKey System.getenv('CURSEFORGE_TOKEN') + // noinspection GroovyAssignabilityCheck + project { + id = propertyString('curseforge_project_id') + addGameVersion 'Java 8' + addGameVersion 'Forge' + addGameVersion '1.12.2' + releaseType = propertyString('release_type') + if (propertyBool('publish_with_changelog')) { + String parsedChangelog = parseChangelog() + if (parsedChangelog != null) { + changelogType = 'markdown' + changelog = parsedChangelog + } + } + mainArtifact tasks.reobfJar, { + displayName "${propertyString('mod_name')} ${propertyString('mod_version')}" + if (propertyBool('use_mixins') || propertyBool('use_asset_mover')) { + relations { + if (propertyBool('use_mixins')) { + requiredDependency 'mixin-booter' + } + if (propertyBool('use_asset_mover')) { + requiredDependency 'assetmover' + } + } + } + } + options { + debug = propertyBool('curseforge_debug') + } + } + } +} + +// Documentation here: https://github.com/modrinth/minotaur +if (propertyBool('publish_to_modrinth')) { + apply plugin: 'com.modrinth.minotaur' + assertEnvironmentVariable('MODRINTH_TOKEN') + assertProperty('modrinth_project_id') + assertProperty('release_type') + setDefaultProperty('modrinth_debug', false, false) + modrinth { + token = System.getenv('MODRINTH_TOKEN') + projectId = propertyString('modrinth_project_id') + versionNumber = propertyString('mod_version') + versionType = propertyString('release_type') + uploadFile = tasks.reobfJar + gameVersions ['1.12.2'] + loaders ['forge'] + debugMode = propertyBool('modrinth_debug') + if (propertyBool('use_mixins') || propertyBool('use_asset_mover')) { + dependencies { + if (propertyBool('use_mixins')) { + required.project 'mixinbooter' + } + if (propertyBool('use_asset_mover')) { + required.project 'assetmover' + } + } + } + if (propertyBool('publish_with_changelog')) { + String parsedChangelog = parseChangelog() + if (parsedChangelog != null) { + changelog = parsedChangelog + } + } + if (propertyBool('modrinth_sync_readme')) { + syncBodyFrom = file('README.md').text + tasks.modrinth.dependsOn(tasks.modrinthSyncBody) + } + } +} + +private String parseChangelog() { + if (propertyBool('publish_with_changelog')) { + if (!file('CHANGELOG.md').exists()) { + throw new GradleException('publish_with_changelog is true, but CHANGELOG.md does not exist in the workspace!') + } + String parsedChangelog = changelog.renderItem(changelog.getLatest().withHeader(false).withEmptySections(false), + org.jetbrains.changelog.Changelog.OutputType.MARKDOWN) + if (parsedChangelog.isEmpty()) { + throw new GradleException('publish_with_changelog is true, but the changelog for the latest version is empty!') + } + return parsedChangelog + } + return null +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 0817b20dce..c4d9ad934a 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:575098db54a998ff1c6770b352c3b16766c09848bee7555dab09afc34e8cf590 -size 59821 +oid sha256:ed2c26eba7cfb93cc2b7785d05e534f07b5b48b5e7fc941921cd098628abca58 +size 62076 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2ec77e51a9..c30b486a89 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787337..aeb74cbb43 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # 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 +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ fi 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 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd32c4..93e3f59f13 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/lib/appliedenergistics2-rv6-stable-7-api.jar b/lib/appliedenergistics2-rv6-stable-7-api.jar deleted file mode 100644 index 7d2fc0da9f..0000000000 --- a/lib/appliedenergistics2-rv6-stable-7-api.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e43f36b649880fe178260da2261e9c0781aacbbd03aedda8a267e88f017a7b6 -size 434012 diff --git a/common/logisticspipes/proxy/specialconnection/TeleportPipes.java b/logs/latest.log similarity index 100% rename from common/logisticspipes/proxy/specialconnection/TeleportPipes.java rename to logs/latest.log diff --git a/resources_raw/mcmod.info b/resources_raw/mcmod.info deleted file mode 100644 index 8dc4ad5e21..0000000000 --- a/resources_raw/mcmod.info +++ /dev/null @@ -1,35 +0,0 @@ -[{ - "modid": "logisticspipes", - "name": "Logistics Pipes", - "description": "Logistics Pipes is an extensive overhaul of the Buildcraft pipe system. It allows for better distribution of items via pipes, more organised stockkeeping and easier automated crafting.", - "version": "${version}", - "mcversion": "${mcversion}", - "url": "https://github.com/RS485/LogisticsPipes", - "updateUrl": "", - "authorList": [ "RS485", "LP Team" ], - "credits": "Contributors: https://github.com/RS485/LogisticsPipes/contributors. Original code and idea made by Krapht. Thanks!", - "logoFile": "", - "screenshots": [], - "requiredMods": [ - "forge@[10.12.1.1079,)", - "codechickenlib@[3.1.7.340,)" - ], - "dependencies": [ - "forge@[10.12.1.1079,)", - "codechickenlib@[3.1.7.340,)", - "buildcraftcore", - "buildcrafttransport", - "buildcraftsilicon", - "buildcraftrobotics", - "ic2", - "computercraft", - "factorization", - "gregtech_addon", - "appliedenergistics", - "thermalexpansion", - "betterstorage", - "mcmultipart" - ], - "dependants": [], - "useDependencyInformation": true -}] diff --git a/settings.gradle b/settings.gradle index e63e3162ed..4d208c5a6f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,26 @@ -rootProject.name = 'LogisticsPipes' +pluginManagement { + repositories { + maven { + // RetroFuturaGradle + name 'GTNH Maven' + url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/' + allowInsecureProtocol = 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' +} + +// Due to an IntelliJ bug, this has to be done +// rootProject.name = archives_base_name +rootProject.name = rootProject.projectDir.getName() diff --git a/src/api/kotlin/network/rs485/logisticspipes/connection/Adjacent.kt b/src/api/kotlin/network/rs485/logisticspipes/connection/Adjacent.kt index 118c0aec50..c19a8926b4 100644 --- a/src/api/kotlin/network/rs485/logisticspipes/connection/Adjacent.kt +++ b/src/api/kotlin/network/rs485/logisticspipes/connection/Adjacent.kt @@ -53,4 +53,6 @@ interface Adjacent { fun fluidTanks(): List> + fun copy(): Adjacent + } diff --git a/src/api/kotlin/network/rs485/logisticspipes/property/ListProperty.kt b/src/api/kotlin/network/rs485/logisticspipes/property/ListProperty.kt index 693be113d5..b9c5bbbc49 100644 --- a/src/api/kotlin/network/rs485/logisticspipes/property/ListProperty.kt +++ b/src/api/kotlin/network/rs485/logisticspipes/property/ListProperty.kt @@ -37,6 +37,7 @@ package network.rs485.logisticspipes.property +import org.apache.commons.lang3.Validate import net.minecraft.nbt.NBTTagCompound import java.util.concurrent.CopyOnWriteArraySet import java.util.function.UnaryOperator @@ -134,6 +135,25 @@ abstract class ListProperty( } +abstract class NonNullListProperty(list: MutableList) : ListProperty(list) { + override fun add(element: T): Boolean { + Validate.notNull(element) + return list.add(element).alsoIChanged() + } + + override fun add(index: Int, element: T) { + Validate.notNull(element) + list.add(index, element).alsoIChanged() + } + + override fun set(index: Int, element: T): T { + Validate.notNull(element) + return list.set(index, element).alsoIChanged() + } + + +} + class IntListProperty : ListProperty { override val tagKey: String diff --git a/src/api/kotlin/network/rs485/logisticspipes/property/StringProperty.kt b/src/api/kotlin/network/rs485/logisticspipes/property/StringProperty.kt new file mode 100644 index 0000000000..aab321f3fd --- /dev/null +++ b/src/api/kotlin/network/rs485/logisticspipes/property/StringProperty.kt @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2023 RS485 + * + * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public + * License 1.0.1, or MMPL. Please check the contents of the license located in + * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md + * + * This file can instead be distributed under the license terms of the + * MIT license: + * + * Copyright (c) 2023 RS485 + * + * This MIT license was reworded to only match this file. If you use the regular + * MIT license in your project, replace this copyright notice (this line and any + * lines below and NOT the copyright line above) with the lines from the original + * MIT license located here: http://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this file and associated documentation files (the "Source Code"), to deal in + * the Source Code without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Source Code, and to permit persons to whom the Source Code is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Source Code, which also can be + * distributed under the MIT. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package network.rs485.logisticspipes.property + +import net.minecraft.nbt.NBTTagCompound + +class StringProperty(initialValue: String, override val tagKey: String) : ValueProperty(initialValue) { + + override fun readFromNBT(tag: NBTTagCompound) { + if (tag.hasKey(tagKey)) value = tag.getString(tagKey) + } + + override fun writeToNBT(tag: NBTTagCompound) = tag.setString(tagKey, value) + + override fun copyValue(): String = value + + override fun copyProperty(): StringProperty = StringProperty(copyValue(), tagKey) + + fun isEmpty(): Boolean = value.isEmpty() + +} diff --git a/dummy/src/main/java/com/enderio/core/api/common/util/IProgressTile.java b/src/dummy/java/com/enderio/core/api/common/util/IProgressTile.java similarity index 100% rename from dummy/src/main/java/com/enderio/core/api/common/util/IProgressTile.java rename to src/dummy/java/com/enderio/core/api/common/util/IProgressTile.java diff --git a/dummy/src/main/java/com/enderio/core/common/util/BlockCoord.java b/src/dummy/java/com/enderio/core/common/util/BlockCoord.java similarity index 100% rename from dummy/src/main/java/com/enderio/core/common/util/BlockCoord.java rename to src/dummy/java/com/enderio/core/common/util/BlockCoord.java diff --git a/dummy/src/main/java/com/enderio/core/common/util/InventoryWrapper.java b/src/dummy/java/com/enderio/core/common/util/InventoryWrapper.java similarity index 100% rename from dummy/src/main/java/com/enderio/core/common/util/InventoryWrapper.java rename to src/dummy/java/com/enderio/core/common/util/InventoryWrapper.java diff --git a/dummy/src/main/java/com/enderio/core/common/util/RoundRobinIterator.java b/src/dummy/java/com/enderio/core/common/util/RoundRobinIterator.java similarity index 100% rename from dummy/src/main/java/com/enderio/core/common/util/RoundRobinIterator.java rename to src/dummy/java/com/enderio/core/common/util/RoundRobinIterator.java diff --git a/dummy/src/main/java/cpw/mods/ironchest/client/gui/chest/GUIChest.java b/src/dummy/java/cpw/mods/ironchest/client/gui/chest/GUIChest.java similarity index 100% rename from dummy/src/main/java/cpw/mods/ironchest/client/gui/chest/GUIChest.java rename to src/dummy/java/cpw/mods/ironchest/client/gui/chest/GUIChest.java diff --git a/dummy/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java b/src/dummy/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java similarity index 100% rename from dummy/src/main/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java rename to src/dummy/java/cpw/mods/ironchest/common/tileentity/chest/TileEntityIronChest.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/dummy/java/crazypants/enderio/conduit/AbstractConduit.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/AbstractConduit.java rename to src/dummy/java/crazypants/enderio/conduit/AbstractConduit.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/ConnectionMode.java b/src/dummy/java/crazypants/enderio/conduit/ConnectionMode.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/ConnectionMode.java rename to src/dummy/java/crazypants/enderio/conduit/ConnectionMode.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/dummy/java/crazypants/enderio/conduit/IConduit.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/IConduit.java rename to src/dummy/java/crazypants/enderio/conduit/IConduit.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/dummy/java/crazypants/enderio/conduit/IConduitBundle.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/IConduitBundle.java rename to src/dummy/java/crazypants/enderio/conduit/IConduitBundle.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/dummy/java/crazypants/enderio/conduit/item/IItemConduit.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java rename to src/dummy/java/crazypants/enderio/conduit/item/IItemConduit.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/dummy/java/crazypants/enderio/conduit/item/ItemConduit.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java rename to src/dummy/java/crazypants/enderio/conduit/item/ItemConduit.java diff --git a/dummy/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java b/src/dummy/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java rename to src/dummy/java/crazypants/enderio/conduit/liquid/ILiquidConduit.java diff --git a/dummy/src/main/java/crazypants/enderio/machine/transceiver/Channel.java b/src/dummy/java/crazypants/enderio/machine/transceiver/Channel.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/machine/transceiver/Channel.java rename to src/dummy/java/crazypants/enderio/machine/transceiver/Channel.java diff --git a/dummy/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java b/src/dummy/java/crazypants/enderio/machine/transceiver/ChannelType.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/machine/transceiver/ChannelType.java rename to src/dummy/java/crazypants/enderio/machine/transceiver/ChannelType.java diff --git a/dummy/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/dummy/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java rename to src/dummy/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java diff --git a/dummy/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/dummy/java/crazypants/enderio/machine/transceiver/TileTransceiver.java similarity index 100% rename from dummy/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java rename to src/dummy/java/crazypants/enderio/machine/transceiver/TileTransceiver.java diff --git a/dummy/src/main/java/ic2/api/classic/tile/machine/IProgressMachine.java b/src/dummy/java/ic2/api/classic/tile/machine/IProgressMachine.java similarity index 100% rename from dummy/src/main/java/ic2/api/classic/tile/machine/IProgressMachine.java rename to src/dummy/java/ic2/api/classic/tile/machine/IProgressMachine.java diff --git a/dummy/src/main/java/ic2/core/block/machine/tileentity/TileEntityStandardMachine.java b/src/dummy/java/ic2/core/block/machine/tileentity/TileEntityStandardMachine.java similarity index 100% rename from dummy/src/main/java/ic2/core/block/machine/tileentity/TileEntityStandardMachine.java rename to src/dummy/java/ic2/core/block/machine/tileentity/TileEntityStandardMachine.java diff --git a/dummy/src/main/java/org/luaj/vm2/LuaNil.java b/src/dummy/java/org/luaj/vm2/LuaNil.java similarity index 100% rename from dummy/src/main/java/org/luaj/vm2/LuaNil.java rename to src/dummy/java/org/luaj/vm2/LuaNil.java diff --git a/dummy/src/main/java/org/luaj/vm2/LuaTable.java b/src/dummy/java/org/luaj/vm2/LuaTable.java similarity index 100% rename from dummy/src/main/java/org/luaj/vm2/LuaTable.java rename to src/dummy/java/org/luaj/vm2/LuaTable.java diff --git a/dummy/src/main/java/org/luaj/vm2/LuaValue.java b/src/dummy/java/org/luaj/vm2/LuaValue.java similarity index 100% rename from dummy/src/main/java/org/luaj/vm2/LuaValue.java rename to src/dummy/java/org/luaj/vm2/LuaValue.java diff --git a/dummy/src/main/java/org/luaj/vm2/Varargs.java b/src/dummy/java/org/luaj/vm2/Varargs.java similarity index 100% rename from dummy/src/main/java/org/luaj/vm2/Varargs.java rename to src/dummy/java/org/luaj/vm2/Varargs.java diff --git a/common/logisticspipes/LPBlocks.java b/src/main/java/logisticspipes/LPBlocks.java similarity index 100% rename from common/logisticspipes/LPBlocks.java rename to src/main/java/logisticspipes/LPBlocks.java diff --git a/common/logisticspipes/LPConstants.java b/src/main/java/logisticspipes/LPConstants.java similarity index 100% rename from common/logisticspipes/LPConstants.java rename to src/main/java/logisticspipes/LPConstants.java diff --git a/common/logisticspipes/LPItems.java b/src/main/java/logisticspipes/LPItems.java similarity index 100% rename from common/logisticspipes/LPItems.java rename to src/main/java/logisticspipes/LPItems.java diff --git a/common/logisticspipes/LogisticsEventListener.java b/src/main/java/logisticspipes/LogisticsEventListener.java similarity index 98% rename from common/logisticspipes/LogisticsEventListener.java rename to src/main/java/logisticspipes/LogisticsEventListener.java index 2cd1c8b764..fd82c2695f 100644 --- a/common/logisticspipes/LogisticsEventListener.java +++ b/src/main/java/logisticspipes/LogisticsEventListener.java @@ -113,7 +113,7 @@ public void onPlayerLeftClickBlock(final PlayerInteractEvent.LeftClickBlock even World world = event.getEntityPlayer().world; BlockPos pos = tile.getPos(); IBlockState state = world.getBlockState(pos); - world.markAndNotifyBlock(tile.getPos(), world.getChunkFromBlockCoords(pos), state, state, 2); + world.markAndNotifyBlock(tile.getPos(), world.getChunk(pos), state, state, 2); ((CoreRoutedPipe) ((LogisticsTileGenericPipe) tile).pipe).delayTo = System.currentTimeMillis() + 200; ((CoreRoutedPipe) ((LogisticsTileGenericPipe) tile).pipe).repeatFor = 10; } else { @@ -315,7 +315,7 @@ public void onItemStackToolTip(ItemTooltipEvent event) { @SubscribeEvent public void onItemCrafting(PlayerEvent.ItemCraftedEvent event) { if (event.player.isServerWorld() && !event.crafting.isEmpty()) { - if (event.crafting.getItem().getRegistryName().getResourceDomain().equals(LPConstants.LP_MOD_ID)) { + if (event.crafting.getItem().getRegistryName().getNamespace().equals(LPConstants.LP_MOD_ID)) { PlayerIdentifier identifier = PlayerIdentifier.get(event.player); PlayerConfiguration config = LogisticsPipes.getServerConfigManager().getPlayerConfiguration(identifier); if (!config.getHasCraftedLPItem() && !LogisticsPipes.isDEBUG()) { diff --git a/common/logisticspipes/LogisticsPipes.java b/src/main/java/logisticspipes/LogisticsPipes.java similarity index 99% rename from common/logisticspipes/LogisticsPipes.java rename to src/main/java/logisticspipes/LogisticsPipes.java index a89761eadd..5f6c8a3461 100644 --- a/common/logisticspipes/LogisticsPipes.java +++ b/src/main/java/logisticspipes/LogisticsPipes.java @@ -213,7 +213,6 @@ @Mod( name = "Logistics Pipes", modid = LPConstants.LP_MOD_ID, - certificateFingerprint = "e0c86912b2f7cc0cc646ad57799574aea43dbd45", useMetadata = true) public class LogisticsPipes { //@formatter:on @@ -312,7 +311,8 @@ public static String getVersionString() { @SideOnly(Side.CLIENT) @Nonnull - public ItemStack getTabIconItem() { + @Override + public ItemStack createIcon() { return new ItemStack(LPItems.pipeBasic); } }; @@ -577,14 +577,14 @@ public static T setName(T item, String name) { public static T setName(T item, String name, String modID) { item.setRegistryName(modID, name); - item.setUnlocalizedName(String.format("%s.%s", modID, name)); + item.setTranslationKey(String.format("%s.%s", modID, name)); return item; } // TODO move somewhere public static T setName(T block, String name) { block.setRegistryName(LPConstants.LP_MOD_ID, name); - block.setUnlocalizedName(String.format("%s.%s", LPConstants.LP_MOD_ID, name)); + block.setTranslationKey(String.format("%s.%s", LPConstants.LP_MOD_ID, name)); return block; } @@ -759,12 +759,12 @@ protected void registerShapelessResetRecipe(Item fromItem, Item toItem) { ItemStack output = new ItemStack(toItem, 1, 0); - ResourceLocation baseLoc = new ResourceLocation(LPConstants.LP_MOD_ID, fromItem.getRegistryName().getResourcePath() + ".resetrecipe"); + ResourceLocation baseLoc = new ResourceLocation(LPConstants.LP_MOD_ID, fromItem.getRegistryName().getPath() + ".resetrecipe"); ResourceLocation recipeLoc = baseLoc; int index = 0; while (CraftingManager.REGISTRY.containsKey(recipeLoc)) { index++; - recipeLoc = new ResourceLocation(LPConstants.LP_MOD_ID, baseLoc.getResourcePath() + "_" + index); + recipeLoc = new ResourceLocation(LPConstants.LP_MOD_ID, baseLoc.getPath() + "_" + index); } ShapelessRecipes recipe = new ShapelessRecipes("logisticspipes.resetrecipe.pipe", output, list); diff --git a/common/logisticspipes/api/IHUDArmor.java b/src/main/java/logisticspipes/api/IHUDArmor.java similarity index 100% rename from common/logisticspipes/api/IHUDArmor.java rename to src/main/java/logisticspipes/api/IHUDArmor.java diff --git a/common/logisticspipes/api/ILPPipe.java b/src/main/java/logisticspipes/api/ILPPipe.java similarity index 100% rename from common/logisticspipes/api/ILPPipe.java rename to src/main/java/logisticspipes/api/ILPPipe.java diff --git a/common/logisticspipes/api/ILPPipeConfigTool.java b/src/main/java/logisticspipes/api/ILPPipeConfigTool.java similarity index 100% rename from common/logisticspipes/api/ILPPipeConfigTool.java rename to src/main/java/logisticspipes/api/ILPPipeConfigTool.java diff --git a/common/logisticspipes/api/ILPPipeTile.java b/src/main/java/logisticspipes/api/ILPPipeTile.java similarity index 100% rename from common/logisticspipes/api/ILPPipeTile.java rename to src/main/java/logisticspipes/api/ILPPipeTile.java diff --git a/common/logisticspipes/api/ILogisticsPowerProvider.java b/src/main/java/logisticspipes/api/ILogisticsPowerProvider.java similarity index 100% rename from common/logisticspipes/api/ILogisticsPowerProvider.java rename to src/main/java/logisticspipes/api/ILogisticsPowerProvider.java diff --git a/common/logisticspipes/api/IProgressProvider.java b/src/main/java/logisticspipes/api/IProgressProvider.java similarity index 100% rename from common/logisticspipes/api/IProgressProvider.java rename to src/main/java/logisticspipes/api/IProgressProvider.java diff --git a/common/logisticspipes/api/IRoutedPowerProvider.java b/src/main/java/logisticspipes/api/IRoutedPowerProvider.java similarity index 100% rename from common/logisticspipes/api/IRoutedPowerProvider.java rename to src/main/java/logisticspipes/api/IRoutedPowerProvider.java diff --git a/common/logisticspipes/asm/ClientSideOnlyMethodContent.java b/src/main/java/logisticspipes/asm/ClientSideOnlyMethodContent.java similarity index 100% rename from common/logisticspipes/asm/ClientSideOnlyMethodContent.java rename to src/main/java/logisticspipes/asm/ClientSideOnlyMethodContent.java diff --git a/common/logisticspipes/asm/IgnoreDisabledProxy.java b/src/main/java/logisticspipes/asm/IgnoreDisabledProxy.java similarity index 100% rename from common/logisticspipes/asm/IgnoreDisabledProxy.java rename to src/main/java/logisticspipes/asm/IgnoreDisabledProxy.java diff --git a/common/logisticspipes/asm/LogisticsASMHookClass.java b/src/main/java/logisticspipes/asm/LogisticsASMHookClass.java similarity index 100% rename from common/logisticspipes/asm/LogisticsASMHookClass.java rename to src/main/java/logisticspipes/asm/LogisticsASMHookClass.java diff --git a/common/logisticspipes/asm/LogisticsClassTransformer.java b/src/main/java/logisticspipes/asm/LogisticsClassTransformer.java similarity index 100% rename from common/logisticspipes/asm/LogisticsClassTransformer.java rename to src/main/java/logisticspipes/asm/LogisticsClassTransformer.java diff --git a/common/logisticspipes/asm/LogisticsPipesClassInjector.java b/src/main/java/logisticspipes/asm/LogisticsPipesClassInjector.java similarity index 100% rename from common/logisticspipes/asm/LogisticsPipesClassInjector.java rename to src/main/java/logisticspipes/asm/LogisticsPipesClassInjector.java diff --git a/common/logisticspipes/asm/LogisticsPipesCoreLoader.java b/src/main/java/logisticspipes/asm/LogisticsPipesCoreLoader.java similarity index 100% rename from common/logisticspipes/asm/LogisticsPipesCoreLoader.java rename to src/main/java/logisticspipes/asm/LogisticsPipesCoreLoader.java diff --git a/common/logisticspipes/asm/ModAccessTransformerRemapper.java b/src/main/java/logisticspipes/asm/ModAccessTransformerRemapper.java similarity index 100% rename from common/logisticspipes/asm/ModAccessTransformerRemapper.java rename to src/main/java/logisticspipes/asm/ModAccessTransformerRemapper.java diff --git a/common/logisticspipes/asm/ModDependentField.java b/src/main/java/logisticspipes/asm/ModDependentField.java similarity index 100% rename from common/logisticspipes/asm/ModDependentField.java rename to src/main/java/logisticspipes/asm/ModDependentField.java diff --git a/common/logisticspipes/asm/ModDependentInterface.java b/src/main/java/logisticspipes/asm/ModDependentInterface.java similarity index 100% rename from common/logisticspipes/asm/ModDependentInterface.java rename to src/main/java/logisticspipes/asm/ModDependentInterface.java diff --git a/common/logisticspipes/asm/ModDependentMethod.java b/src/main/java/logisticspipes/asm/ModDependentMethod.java similarity index 100% rename from common/logisticspipes/asm/ModDependentMethod.java rename to src/main/java/logisticspipes/asm/ModDependentMethod.java diff --git a/common/logisticspipes/asm/ModDependentMethodName.java b/src/main/java/logisticspipes/asm/ModDependentMethodName.java similarity index 100% rename from common/logisticspipes/asm/ModDependentMethodName.java rename to src/main/java/logisticspipes/asm/ModDependentMethodName.java diff --git a/common/logisticspipes/asm/ModVersionedClass.java b/src/main/java/logisticspipes/asm/ModVersionedClass.java similarity index 100% rename from common/logisticspipes/asm/ModVersionedClass.java rename to src/main/java/logisticspipes/asm/ModVersionedClass.java diff --git a/common/logisticspipes/asm/ParamProfiler.java b/src/main/java/logisticspipes/asm/ParamProfiler.java similarity index 100% rename from common/logisticspipes/asm/ParamProfiler.java rename to src/main/java/logisticspipes/asm/ParamProfiler.java diff --git a/common/logisticspipes/asm/addinfo/IAddInfo.java b/src/main/java/logisticspipes/asm/addinfo/IAddInfo.java similarity index 100% rename from common/logisticspipes/asm/addinfo/IAddInfo.java rename to src/main/java/logisticspipes/asm/addinfo/IAddInfo.java diff --git a/common/logisticspipes/asm/addinfo/IAddInfoProvider.java b/src/main/java/logisticspipes/asm/addinfo/IAddInfoProvider.java similarity index 100% rename from common/logisticspipes/asm/addinfo/IAddInfoProvider.java rename to src/main/java/logisticspipes/asm/addinfo/IAddInfoProvider.java diff --git a/common/logisticspipes/asm/mcmp/ClassBlockMultipartContainerHandler.java b/src/main/java/logisticspipes/asm/mcmp/ClassBlockMultipartContainerHandler.java similarity index 100% rename from common/logisticspipes/asm/mcmp/ClassBlockMultipartContainerHandler.java rename to src/main/java/logisticspipes/asm/mcmp/ClassBlockMultipartContainerHandler.java diff --git a/common/logisticspipes/asm/mcmp/MCMPHooks.java b/src/main/java/logisticspipes/asm/mcmp/MCMPHooks.java similarity index 100% rename from common/logisticspipes/asm/mcmp/MCMPHooks.java rename to src/main/java/logisticspipes/asm/mcmp/MCMPHooks.java diff --git a/common/logisticspipes/asm/td/ClassRenderDuctItemsHandler.java b/src/main/java/logisticspipes/asm/td/ClassRenderDuctItemsHandler.java similarity index 100% rename from common/logisticspipes/asm/td/ClassRenderDuctItemsHandler.java rename to src/main/java/logisticspipes/asm/td/ClassRenderDuctItemsHandler.java diff --git a/common/logisticspipes/asm/td/ClassTravelingItemHandler.java b/src/main/java/logisticspipes/asm/td/ClassTravelingItemHandler.java similarity index 100% rename from common/logisticspipes/asm/td/ClassTravelingItemHandler.java rename to src/main/java/logisticspipes/asm/td/ClassTravelingItemHandler.java diff --git a/common/logisticspipes/asm/td/ILPTravelingItemInfo.java b/src/main/java/logisticspipes/asm/td/ILPTravelingItemInfo.java similarity index 100% rename from common/logisticspipes/asm/td/ILPTravelingItemInfo.java rename to src/main/java/logisticspipes/asm/td/ILPTravelingItemInfo.java diff --git a/common/logisticspipes/asm/td/ThermalDynamicsHooks.java b/src/main/java/logisticspipes/asm/td/ThermalDynamicsHooks.java similarity index 100% rename from common/logisticspipes/asm/td/ThermalDynamicsHooks.java rename to src/main/java/logisticspipes/asm/td/ThermalDynamicsHooks.java diff --git a/common/logisticspipes/asm/te/ILPTEInformation.java b/src/main/java/logisticspipes/asm/te/ILPTEInformation.java similarity index 100% rename from common/logisticspipes/asm/te/ILPTEInformation.java rename to src/main/java/logisticspipes/asm/te/ILPTEInformation.java diff --git a/common/logisticspipes/asm/te/ITileEntityChangeListener.java b/src/main/java/logisticspipes/asm/te/ITileEntityChangeListener.java similarity index 100% rename from common/logisticspipes/asm/te/ITileEntityChangeListener.java rename to src/main/java/logisticspipes/asm/te/ITileEntityChangeListener.java diff --git a/common/logisticspipes/asm/te/LPTileEntityObject.java b/src/main/java/logisticspipes/asm/te/LPTileEntityObject.java similarity index 100% rename from common/logisticspipes/asm/te/LPTileEntityObject.java rename to src/main/java/logisticspipes/asm/te/LPTileEntityObject.java diff --git a/common/logisticspipes/asm/util/ASMHelper.java b/src/main/java/logisticspipes/asm/util/ASMHelper.java similarity index 100% rename from common/logisticspipes/asm/util/ASMHelper.java rename to src/main/java/logisticspipes/asm/util/ASMHelper.java diff --git a/common/logisticspipes/asm/wrapper/AbstractSubWrapper.java b/src/main/java/logisticspipes/asm/wrapper/AbstractSubWrapper.java similarity index 100% rename from common/logisticspipes/asm/wrapper/AbstractSubWrapper.java rename to src/main/java/logisticspipes/asm/wrapper/AbstractSubWrapper.java diff --git a/common/logisticspipes/asm/wrapper/AbstractWrapper.java b/src/main/java/logisticspipes/asm/wrapper/AbstractWrapper.java similarity index 100% rename from common/logisticspipes/asm/wrapper/AbstractWrapper.java rename to src/main/java/logisticspipes/asm/wrapper/AbstractWrapper.java diff --git a/common/logisticspipes/asm/wrapper/CraftingRecipeProviderWrapper.java b/src/main/java/logisticspipes/asm/wrapper/CraftingRecipeProviderWrapper.java similarity index 100% rename from common/logisticspipes/asm/wrapper/CraftingRecipeProviderWrapper.java rename to src/main/java/logisticspipes/asm/wrapper/CraftingRecipeProviderWrapper.java diff --git a/common/logisticspipes/asm/wrapper/GenericLPPipeConfigToolWrapper.java b/src/main/java/logisticspipes/asm/wrapper/GenericLPPipeConfigToolWrapper.java similarity index 100% rename from common/logisticspipes/asm/wrapper/GenericLPPipeConfigToolWrapper.java rename to src/main/java/logisticspipes/asm/wrapper/GenericLPPipeConfigToolWrapper.java diff --git a/common/logisticspipes/asm/wrapper/GenericProgressProviderWrapper.java b/src/main/java/logisticspipes/asm/wrapper/GenericProgressProviderWrapper.java similarity index 100% rename from common/logisticspipes/asm/wrapper/GenericProgressProviderWrapper.java rename to src/main/java/logisticspipes/asm/wrapper/GenericProgressProviderWrapper.java diff --git a/common/logisticspipes/asm/wrapper/LogisticsWrapperHandler.java b/src/main/java/logisticspipes/asm/wrapper/LogisticsWrapperHandler.java similarity index 100% rename from common/logisticspipes/asm/wrapper/LogisticsWrapperHandler.java rename to src/main/java/logisticspipes/asm/wrapper/LogisticsWrapperHandler.java diff --git a/common/logisticspipes/asm/wrapper/WrapperState.java b/src/main/java/logisticspipes/asm/wrapper/WrapperState.java similarity index 100% rename from common/logisticspipes/asm/wrapper/WrapperState.java rename to src/main/java/logisticspipes/asm/wrapper/WrapperState.java diff --git a/common/logisticspipes/blocks/BlockDummy.java b/src/main/java/logisticspipes/blocks/BlockDummy.java similarity index 100% rename from common/logisticspipes/blocks/BlockDummy.java rename to src/main/java/logisticspipes/blocks/BlockDummy.java diff --git a/common/logisticspipes/blocks/LogisticsProgramCompilerTileEntity.java b/src/main/java/logisticspipes/blocks/LogisticsProgramCompilerTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/LogisticsProgramCompilerTileEntity.java rename to src/main/java/logisticspipes/blocks/LogisticsProgramCompilerTileEntity.java diff --git a/common/logisticspipes/blocks/LogisticsSecurityTileEntity.java b/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java similarity index 99% rename from common/logisticspipes/blocks/LogisticsSecurityTileEntity.java rename to src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java index c5f8ec2f4a..c8219b9e2b 100644 --- a/common/logisticspipes/blocks/LogisticsSecurityTileEntity.java +++ b/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java @@ -10,6 +10,8 @@ import java.util.UUID; import javax.annotation.Nonnull; +import logisticspipes.utils.FastUUID; + import net.minecraft.crash.CrashReportCategory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -142,7 +144,7 @@ public void setClientDestroy(boolean flag) { public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); if (par1nbtTagCompound.hasKey("UUID")) { - secId = UUID.fromString(par1nbtTagCompound.getString("UUID")); + secId = FastUUID.parseUUID(par1nbtTagCompound.getString("UUID")); } allowCC = par1nbtTagCompound.getBoolean("allowCC"); allowAutoDestroy = par1nbtTagCompound.getBoolean("allowAutoDestroy"); diff --git a/common/logisticspipes/blocks/LogisticsSolidBlock.java b/src/main/java/logisticspipes/blocks/LogisticsSolidBlock.java similarity index 100% rename from common/logisticspipes/blocks/LogisticsSolidBlock.java rename to src/main/java/logisticspipes/blocks/LogisticsSolidBlock.java diff --git a/common/logisticspipes/blocks/LogisticsSolidTileEntity.java b/src/main/java/logisticspipes/blocks/LogisticsSolidTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/LogisticsSolidTileEntity.java rename to src/main/java/logisticspipes/blocks/LogisticsSolidTileEntity.java diff --git a/common/logisticspipes/blocks/crafting/AutoCraftingInventory.java b/src/main/java/logisticspipes/blocks/crafting/AutoCraftingInventory.java similarity index 100% rename from common/logisticspipes/blocks/crafting/AutoCraftingInventory.java rename to src/main/java/logisticspipes/blocks/crafting/AutoCraftingInventory.java diff --git a/common/logisticspipes/blocks/crafting/LogisticsCraftingTableTileEntity.java b/src/main/java/logisticspipes/blocks/crafting/LogisticsCraftingTableTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/crafting/LogisticsCraftingTableTileEntity.java rename to src/main/java/logisticspipes/blocks/crafting/LogisticsCraftingTableTileEntity.java diff --git a/common/logisticspipes/blocks/powertile/LogisticsIC2PowerProviderTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsIC2PowerProviderTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/powertile/LogisticsIC2PowerProviderTileEntity.java rename to src/main/java/logisticspipes/blocks/powertile/LogisticsIC2PowerProviderTileEntity.java diff --git a/common/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java rename to src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java diff --git a/common/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java rename to src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java diff --git a/common/logisticspipes/blocks/powertile/LogisticsRFPowerProviderTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsRFPowerProviderTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/powertile/LogisticsRFPowerProviderTileEntity.java rename to src/main/java/logisticspipes/blocks/powertile/LogisticsRFPowerProviderTileEntity.java diff --git a/common/logisticspipes/blocks/stats/LogisticsStatisticsTileEntity.java b/src/main/java/logisticspipes/blocks/stats/LogisticsStatisticsTileEntity.java similarity index 100% rename from common/logisticspipes/blocks/stats/LogisticsStatisticsTileEntity.java rename to src/main/java/logisticspipes/blocks/stats/LogisticsStatisticsTileEntity.java diff --git a/common/logisticspipes/blocks/stats/TrackingTask.java b/src/main/java/logisticspipes/blocks/stats/TrackingTask.java similarity index 100% rename from common/logisticspipes/blocks/stats/TrackingTask.java rename to src/main/java/logisticspipes/blocks/stats/TrackingTask.java diff --git a/common/logisticspipes/commands/LogisticsPipesCommand.java b/src/main/java/logisticspipes/commands/LogisticsPipesCommand.java similarity index 100% rename from common/logisticspipes/commands/LogisticsPipesCommand.java rename to src/main/java/logisticspipes/commands/LogisticsPipesCommand.java diff --git a/common/logisticspipes/commands/MainCommandHandler.java b/src/main/java/logisticspipes/commands/MainCommandHandler.java similarity index 100% rename from common/logisticspipes/commands/MainCommandHandler.java rename to src/main/java/logisticspipes/commands/MainCommandHandler.java diff --git a/common/logisticspipes/commands/abstracts/ICommandHandler.java b/src/main/java/logisticspipes/commands/abstracts/ICommandHandler.java similarity index 100% rename from common/logisticspipes/commands/abstracts/ICommandHandler.java rename to src/main/java/logisticspipes/commands/abstracts/ICommandHandler.java diff --git a/common/logisticspipes/commands/abstracts/SubCommandHandler.java b/src/main/java/logisticspipes/commands/abstracts/SubCommandHandler.java similarity index 100% rename from common/logisticspipes/commands/abstracts/SubCommandHandler.java rename to src/main/java/logisticspipes/commands/abstracts/SubCommandHandler.java diff --git a/common/logisticspipes/commands/chathelper/LPChatListener.java b/src/main/java/logisticspipes/commands/chathelper/LPChatListener.java similarity index 100% rename from common/logisticspipes/commands/chathelper/LPChatListener.java rename to src/main/java/logisticspipes/commands/chathelper/LPChatListener.java diff --git a/common/logisticspipes/commands/chathelper/MorePageDisplay.java b/src/main/java/logisticspipes/commands/chathelper/MorePageDisplay.java similarity index 100% rename from common/logisticspipes/commands/chathelper/MorePageDisplay.java rename to src/main/java/logisticspipes/commands/chathelper/MorePageDisplay.java diff --git a/common/logisticspipes/commands/commands/BypassCommand.java b/src/main/java/logisticspipes/commands/commands/BypassCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/BypassCommand.java rename to src/main/java/logisticspipes/commands/commands/BypassCommand.java diff --git a/common/logisticspipes/commands/commands/ChangelogCommand.java b/src/main/java/logisticspipes/commands/commands/ChangelogCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/ChangelogCommand.java rename to src/main/java/logisticspipes/commands/commands/ChangelogCommand.java diff --git a/common/logisticspipes/commands/commands/ClearCommand.java b/src/main/java/logisticspipes/commands/commands/ClearCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/ClearCommand.java rename to src/main/java/logisticspipes/commands/commands/ClearCommand.java diff --git a/common/logisticspipes/commands/commands/DebugCommand.java b/src/main/java/logisticspipes/commands/commands/DebugCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/DebugCommand.java rename to src/main/java/logisticspipes/commands/commands/DebugCommand.java diff --git a/common/logisticspipes/commands/commands/DummyCommand.java b/src/main/java/logisticspipes/commands/commands/DummyCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/DummyCommand.java rename to src/main/java/logisticspipes/commands/commands/DummyCommand.java diff --git a/common/logisticspipes/commands/commands/DumpCommand.java b/src/main/java/logisticspipes/commands/commands/DumpCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/DumpCommand.java rename to src/main/java/logisticspipes/commands/commands/DumpCommand.java diff --git a/common/logisticspipes/commands/commands/NBTDebugCommand.java b/src/main/java/logisticspipes/commands/commands/NBTDebugCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/NBTDebugCommand.java rename to src/main/java/logisticspipes/commands/commands/NBTDebugCommand.java diff --git a/common/logisticspipes/commands/commands/NameLookupCommand.java b/src/main/java/logisticspipes/commands/commands/NameLookupCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/NameLookupCommand.java rename to src/main/java/logisticspipes/commands/commands/NameLookupCommand.java diff --git a/common/logisticspipes/commands/commands/RoutingThreadCommand.java b/src/main/java/logisticspipes/commands/commands/RoutingThreadCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/RoutingThreadCommand.java rename to src/main/java/logisticspipes/commands/commands/RoutingThreadCommand.java diff --git a/common/logisticspipes/commands/commands/TestCommand.java b/src/main/java/logisticspipes/commands/commands/TestCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/TestCommand.java rename to src/main/java/logisticspipes/commands/commands/TestCommand.java diff --git a/common/logisticspipes/commands/commands/TransferNamesCommand.java b/src/main/java/logisticspipes/commands/commands/TransferNamesCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/TransferNamesCommand.java rename to src/main/java/logisticspipes/commands/commands/TransferNamesCommand.java diff --git a/common/logisticspipes/commands/commands/VersionCommand.java b/src/main/java/logisticspipes/commands/commands/VersionCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/VersionCommand.java rename to src/main/java/logisticspipes/commands/commands/VersionCommand.java diff --git a/common/logisticspipes/commands/commands/WrapperCommand.java b/src/main/java/logisticspipes/commands/commands/WrapperCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/WrapperCommand.java rename to src/main/java/logisticspipes/commands/commands/WrapperCommand.java diff --git a/common/logisticspipes/commands/commands/debug/DebugGuiController.java b/src/main/java/logisticspipes/commands/commands/debug/DebugGuiController.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/DebugGuiController.java rename to src/main/java/logisticspipes/commands/commands/debug/DebugGuiController.java diff --git a/common/logisticspipes/commands/commands/debug/HandCommand.java b/src/main/java/logisticspipes/commands/commands/debug/HandCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/HandCommand.java rename to src/main/java/logisticspipes/commands/commands/debug/HandCommand.java diff --git a/common/logisticspipes/commands/commands/debug/MeCommand.java b/src/main/java/logisticspipes/commands/commands/debug/MeCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/MeCommand.java rename to src/main/java/logisticspipes/commands/commands/debug/MeCommand.java diff --git a/common/logisticspipes/commands/commands/debug/PipeCommand.java b/src/main/java/logisticspipes/commands/commands/debug/PipeCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/PipeCommand.java rename to src/main/java/logisticspipes/commands/commands/debug/PipeCommand.java diff --git a/common/logisticspipes/commands/commands/debug/RoutingTableCommand.java b/src/main/java/logisticspipes/commands/commands/debug/RoutingTableCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/RoutingTableCommand.java rename to src/main/java/logisticspipes/commands/commands/debug/RoutingTableCommand.java diff --git a/common/logisticspipes/commands/commands/debug/TargetCommand.java b/src/main/java/logisticspipes/commands/commands/debug/TargetCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/debug/TargetCommand.java rename to src/main/java/logisticspipes/commands/commands/debug/TargetCommand.java diff --git a/common/logisticspipes/commands/commands/wrapper/EnableCommand.java b/src/main/java/logisticspipes/commands/commands/wrapper/EnableCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/wrapper/EnableCommand.java rename to src/main/java/logisticspipes/commands/commands/wrapper/EnableCommand.java diff --git a/common/logisticspipes/commands/commands/wrapper/ListCommand.java b/src/main/java/logisticspipes/commands/commands/wrapper/ListCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/wrapper/ListCommand.java rename to src/main/java/logisticspipes/commands/commands/wrapper/ListCommand.java diff --git a/common/logisticspipes/commands/commands/wrapper/ShowCommand.java b/src/main/java/logisticspipes/commands/commands/wrapper/ShowCommand.java similarity index 100% rename from common/logisticspipes/commands/commands/wrapper/ShowCommand.java rename to src/main/java/logisticspipes/commands/commands/wrapper/ShowCommand.java diff --git a/common/logisticspipes/commands/exception/CommandNotFoundException.java b/src/main/java/logisticspipes/commands/exception/CommandNotFoundException.java similarity index 100% rename from common/logisticspipes/commands/exception/CommandNotFoundException.java rename to src/main/java/logisticspipes/commands/exception/CommandNotFoundException.java diff --git a/common/logisticspipes/commands/exception/DuplicatedCommandException.java b/src/main/java/logisticspipes/commands/exception/DuplicatedCommandException.java similarity index 100% rename from common/logisticspipes/commands/exception/DuplicatedCommandException.java rename to src/main/java/logisticspipes/commands/exception/DuplicatedCommandException.java diff --git a/common/logisticspipes/commands/exception/LPCommandException.java b/src/main/java/logisticspipes/commands/exception/LPCommandException.java similarity index 100% rename from common/logisticspipes/commands/exception/LPCommandException.java rename to src/main/java/logisticspipes/commands/exception/LPCommandException.java diff --git a/common/logisticspipes/commands/exception/MissingArgumentException.java b/src/main/java/logisticspipes/commands/exception/MissingArgumentException.java similarity index 100% rename from common/logisticspipes/commands/exception/MissingArgumentException.java rename to src/main/java/logisticspipes/commands/exception/MissingArgumentException.java diff --git a/common/logisticspipes/commands/exception/PermissionDeniedException.java b/src/main/java/logisticspipes/commands/exception/PermissionDeniedException.java similarity index 100% rename from common/logisticspipes/commands/exception/PermissionDeniedException.java rename to src/main/java/logisticspipes/commands/exception/PermissionDeniedException.java diff --git a/common/logisticspipes/config/Configs.java b/src/main/java/logisticspipes/config/Configs.java similarity index 100% rename from common/logisticspipes/config/Configs.java rename to src/main/java/logisticspipes/config/Configs.java diff --git a/common/logisticspipes/datafixer/DataFixerSolidBlockItems.java b/src/main/java/logisticspipes/datafixer/DataFixerSolidBlockItems.java similarity index 100% rename from common/logisticspipes/datafixer/DataFixerSolidBlockItems.java rename to src/main/java/logisticspipes/datafixer/DataFixerSolidBlockItems.java diff --git a/common/logisticspipes/datafixer/DataFixerTE.java b/src/main/java/logisticspipes/datafixer/DataFixerTE.java similarity index 100% rename from common/logisticspipes/datafixer/DataFixerTE.java rename to src/main/java/logisticspipes/datafixer/DataFixerTE.java diff --git a/common/logisticspipes/datafixer/LPDataFixer.java b/src/main/java/logisticspipes/datafixer/LPDataFixer.java similarity index 100% rename from common/logisticspipes/datafixer/LPDataFixer.java rename to src/main/java/logisticspipes/datafixer/LPDataFixer.java diff --git a/common/logisticspipes/datafixer/MissingMappingHandler.java b/src/main/java/logisticspipes/datafixer/MissingMappingHandler.java similarity index 98% rename from common/logisticspipes/datafixer/MissingMappingHandler.java rename to src/main/java/logisticspipes/datafixer/MissingMappingHandler.java index 888583f3a4..edb363ce24 100644 --- a/common/logisticspipes/datafixer/MissingMappingHandler.java +++ b/src/main/java/logisticspipes/datafixer/MissingMappingHandler.java @@ -141,7 +141,7 @@ public class MissingMappingHandler { @SubscribeEvent public void onMissingBlocks(RegistryEvent.MissingMappings e) { for (RegistryEvent.MissingMappings.Mapping m : e.getMappings()) { - String entry = blockIDMap.get(m.key.getResourcePath()); + String entry = blockIDMap.get(m.key.getPath()); if (entry == null) continue; Block value = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(LPConstants.LP_MOD_ID, entry)); if (value == null) continue; @@ -152,7 +152,7 @@ public void onMissingBlocks(RegistryEvent.MissingMappings e) { @SubscribeEvent public void onMissingItems(RegistryEvent.MissingMappings e) { for (RegistryEvent.MissingMappings.Mapping m : e.getMappings()) { - String old = m.key.getResourcePath(); + String old = m.key.getPath(); if (ignoreItems.contains(old)) { m.ignore(); continue; diff --git a/common/logisticspipes/entity/FakeNetServerHandler.java b/src/main/java/logisticspipes/entity/FakeNetServerHandler.java similarity index 99% rename from common/logisticspipes/entity/FakeNetServerHandler.java rename to src/main/java/logisticspipes/entity/FakeNetServerHandler.java index 78fd1b2a2b..59b5a8ea24 100644 --- a/common/logisticspipes/entity/FakeNetServerHandler.java +++ b/src/main/java/logisticspipes/entity/FakeNetServerHandler.java @@ -118,7 +118,7 @@ public void setCompressionThreshold(int threshold) { } public void disableAutoRead() { } @Override - public void checkDisconnected() { } + public void handleDisconnection() { } @Nonnull @Override diff --git a/common/logisticspipes/entity/FakePlayerLP.java b/src/main/java/logisticspipes/entity/FakePlayerLP.java similarity index 87% rename from common/logisticspipes/entity/FakePlayerLP.java rename to src/main/java/logisticspipes/entity/FakePlayerLP.java index 2432ef503d..d9d56a665a 100644 --- a/common/logisticspipes/entity/FakePlayerLP.java +++ b/src/main/java/logisticspipes/entity/FakePlayerLP.java @@ -1,9 +1,10 @@ package logisticspipes.entity; import java.util.List; -import java.util.UUID; import javax.annotation.Nonnull; +import logisticspipes.utils.FastUUID; + import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; @@ -18,7 +19,7 @@ @SuppressWarnings("EntityConstructor") public class FakePlayerLP extends FakePlayer { - public static GameProfile LPPLAYER = new GameProfile(UUID.fromString("e7d8e347-3828-4f39-b76f-ea519857c004"), "[LogisticsPipes]"); + public static GameProfile LPPLAYER = new GameProfile(FastUUID.parseUUID("e7d8e347-3828-4f39-b76f-ea519857c004"), "[LogisticsPipes]"); public String myName = "[LogisticsPipes]"; diff --git a/common/logisticspipes/gui/GuiCardManager.java b/src/main/java/logisticspipes/gui/GuiCardManager.java similarity index 100% rename from common/logisticspipes/gui/GuiCardManager.java rename to src/main/java/logisticspipes/gui/GuiCardManager.java diff --git a/common/logisticspipes/gui/GuiChassisPipe.java b/src/main/java/logisticspipes/gui/GuiChassisPipe.java similarity index 100% rename from common/logisticspipes/gui/GuiChassisPipe.java rename to src/main/java/logisticspipes/gui/GuiChassisPipe.java diff --git a/common/logisticspipes/gui/GuiCraftingPipe.java b/src/main/java/logisticspipes/gui/GuiCraftingPipe.java similarity index 100% rename from common/logisticspipes/gui/GuiCraftingPipe.java rename to src/main/java/logisticspipes/gui/GuiCraftingPipe.java diff --git a/common/logisticspipes/gui/GuiFirewall.java b/src/main/java/logisticspipes/gui/GuiFirewall.java similarity index 99% rename from common/logisticspipes/gui/GuiFirewall.java rename to src/main/java/logisticspipes/gui/GuiFirewall.java index 33e9e90e42..d67cafbee1 100644 --- a/common/logisticspipes/gui/GuiFirewall.java +++ b/src/main/java/logisticspipes/gui/GuiFirewall.java @@ -19,7 +19,7 @@ public class GuiFirewall extends LogisticsBaseGuiScreen { public GuiFirewall(PipeItemsFirewall pipe, EntityPlayer player) { super(230, 260, 0, 0); this.pipe = pipe; - DummyContainer dummy = new DummyContainer(player.inventory, pipe.inv); + DummyContainer dummy = new DummyContainer(player.inventory, pipe.getModuleFirewall().inv); dummy.addNormalSlotsForPlayerInventory(33, 175); for (int x = 0; x < 6; x++) { for (int y = 0; y < 6; y++) { diff --git a/common/logisticspipes/gui/GuiFluidBasic.java b/src/main/java/logisticspipes/gui/GuiFluidBasic.java similarity index 100% rename from common/logisticspipes/gui/GuiFluidBasic.java rename to src/main/java/logisticspipes/gui/GuiFluidBasic.java diff --git a/common/logisticspipes/gui/GuiFluidSupplierMk2Pipe.java b/src/main/java/logisticspipes/gui/GuiFluidSupplierMk2Pipe.java similarity index 100% rename from common/logisticspipes/gui/GuiFluidSupplierMk2Pipe.java rename to src/main/java/logisticspipes/gui/GuiFluidSupplierMk2Pipe.java diff --git a/common/logisticspipes/gui/GuiFluidSupplierPipe.java b/src/main/java/logisticspipes/gui/GuiFluidSupplierPipe.java similarity index 100% rename from common/logisticspipes/gui/GuiFluidSupplierPipe.java rename to src/main/java/logisticspipes/gui/GuiFluidSupplierPipe.java diff --git a/common/logisticspipes/gui/GuiFluidTerminus.java b/src/main/java/logisticspipes/gui/GuiFluidTerminus.java similarity index 100% rename from common/logisticspipes/gui/GuiFluidTerminus.java rename to src/main/java/logisticspipes/gui/GuiFluidTerminus.java diff --git a/common/logisticspipes/gui/GuiFreqCardContent.java b/src/main/java/logisticspipes/gui/GuiFreqCardContent.java similarity index 100% rename from common/logisticspipes/gui/GuiFreqCardContent.java rename to src/main/java/logisticspipes/gui/GuiFreqCardContent.java diff --git a/common/logisticspipes/gui/GuiInvSysConnector.java b/src/main/java/logisticspipes/gui/GuiInvSysConnector.java similarity index 95% rename from common/logisticspipes/gui/GuiInvSysConnector.java rename to src/main/java/logisticspipes/gui/GuiInvSysConnector.java index dc6d6aa8ee..566cc496cd 100644 --- a/common/logisticspipes/gui/GuiInvSysConnector.java +++ b/src/main/java/logisticspipes/gui/GuiInvSysConnector.java @@ -71,7 +71,7 @@ public void initGui() { if (this.resistanceCountBar == null) { this.resistanceCountBar = new InputBar(this.fontRenderer, this, guiLeft + 90, guiTop + 55, 30, 12, false, true, InputBar.Align.CENTER); this.resistanceCountBar.minNumber = 0; - this.resistanceCountBar.setInteger(pipe.resistance); + this.resistanceCountBar.setInteger(pipe.getModuleItemInvSysConnect().resistance.getValue()); } this.resistanceCountBar.reposition(guiLeft + 90, guiTop + 55, 30, 12); @@ -178,8 +178,8 @@ protected void actionPerformed(GuiButton button) throws IOException { } else if (button.id == 4) { resistanceCountBar.setInteger(resistanceCountBar.getInteger() + 1); } else if (button.id == 5) { - pipe.resistance = resistanceCountBar.getInteger(); - MainProxy.sendPacketToServer(PacketHandler.getPacket(InvSysConResistance.class).setInteger(pipe.resistance).setPosX(pipe.getX()).setPosY(pipe.getY()).setPosZ(pipe.getZ())); + pipe.getModuleItemInvSysConnect().resistance.setValue(resistanceCountBar.getInteger()); + MainProxy.sendPacketToServer(PacketHandler.getPacket(InvSysConResistance.class).setInteger(pipe.getModuleItemInvSysConnect().resistance.getValue()).setPosX(pipe.getX()).setPosY(pipe.getY()).setPosZ(pipe.getZ())); } else if (button.id == 6) { MainProxy.sendPacketToServer(PacketHandler.getPacket(InvSysConOpenSelectChannelPopupPacket.class).setTilePos(pipe.container)); } diff --git a/common/logisticspipes/gui/GuiLogisticsCraftingTable.java b/src/main/java/logisticspipes/gui/GuiLogisticsCraftingTable.java similarity index 100% rename from common/logisticspipes/gui/GuiLogisticsCraftingTable.java rename to src/main/java/logisticspipes/gui/GuiLogisticsCraftingTable.java diff --git a/common/logisticspipes/gui/GuiLogisticsSettings.java b/src/main/java/logisticspipes/gui/GuiLogisticsSettings.java similarity index 100% rename from common/logisticspipes/gui/GuiLogisticsSettings.java rename to src/main/java/logisticspipes/gui/GuiLogisticsSettings.java diff --git a/common/logisticspipes/gui/GuiPipeController.java b/src/main/java/logisticspipes/gui/GuiPipeController.java similarity index 98% rename from common/logisticspipes/gui/GuiPipeController.java rename to src/main/java/logisticspipes/gui/GuiPipeController.java index 5d5b03fd14..9590c5d12b 100644 --- a/common/logisticspipes/gui/GuiPipeController.java +++ b/src/main/java/logisticspipes/gui/GuiPipeController.java @@ -6,6 +6,8 @@ import java.util.UUID; import java.util.stream.Collectors; +import logisticspipes.utils.FastUUID; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; @@ -197,7 +199,7 @@ public Security(DummyContainer dummy) { return false; } return SimpleServiceLocator.securityStationManager - .isAuthorized(UUID.fromString(itemStack.getTagCompound().getString("UUID"))); + .isAuthorized(FastUUID.parseUUID(itemStack.getTagCompound().getString("UUID"))); }, 1)); } @@ -216,7 +218,7 @@ public void renderForegroundContent() { fontRenderer.drawString(TextUtil.translate(PREFIX + "security"), 10, 28, Color.getValue(Color.DARKER_GREY), false); ItemStack itemStack = pipe.getOriginalUpgradeManager().secInv.getStackInSlot(0); if (!itemStack.isEmpty()) { - UUID id = UUID.fromString(itemStack.getTagCompound().getString("UUID")); + UUID id = FastUUID.parseUUID(itemStack.getTagCompound().getString("UUID")); fontRenderer.drawString("Id: ", 10, 68, Color.getValue(Color.DARKER_GREY), false); GL11.glTranslated(10, 80, 0); GL11.glScaled(0.75D, 0.75D, 1.0D); diff --git a/common/logisticspipes/gui/GuiPowerJunction.java b/src/main/java/logisticspipes/gui/GuiPowerJunction.java similarity index 100% rename from common/logisticspipes/gui/GuiPowerJunction.java rename to src/main/java/logisticspipes/gui/GuiPowerJunction.java diff --git a/common/logisticspipes/gui/GuiPowerProvider.java b/src/main/java/logisticspipes/gui/GuiPowerProvider.java similarity index 100% rename from common/logisticspipes/gui/GuiPowerProvider.java rename to src/main/java/logisticspipes/gui/GuiPowerProvider.java diff --git a/common/logisticspipes/gui/GuiProgramCompiler.java b/src/main/java/logisticspipes/gui/GuiProgramCompiler.java similarity index 97% rename from common/logisticspipes/gui/GuiProgramCompiler.java rename to src/main/java/logisticspipes/gui/GuiProgramCompiler.java index e339cef89c..ffb5b7e621 100644 --- a/common/logisticspipes/gui/GuiProgramCompiler.java +++ b/src/main/java/logisticspipes/gui/GuiProgramCompiler.java @@ -77,7 +77,7 @@ public String getTextAt(int index) { .filter(it -> StreamSupport.stream(list.spliterator(), false).noneMatch(nbtBase -> ((NBTTagString) nbtBase).getString().equals(it.toString()))) .skip(index) .findFirst() - .map(it -> String.format("%s.%s", it.getResourceDomain(), it.getResourcePath())) + .map(it -> String.format("%s.%s", it.getNamespace(), it.getPath())) .orElse(null)); } @@ -110,7 +110,7 @@ public String getTextAt(int index) { Item selItem = Item.REGISTRY.getObject(sel); if (selItem != null) { - return TextUtil.translate(selItem.getUnlocalizedName() + ".name"); + return TextUtil.translate(selItem.getTranslationKey() + ".name"); } return "UNDEFINED"; } @@ -222,7 +222,7 @@ protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { String name; Item item = Item.REGISTRY.getObject(compiler.getCurrentTask()); if (item != null) { - name = item.getUnlocalizedName() + ".name"; + name = item.getTranslationKey() + ".name"; } else { name = "gui.compiler." + compiler.getCurrentTask().toString().replace(':', '.'); } @@ -277,9 +277,9 @@ private List getProgramListForSelectionIndex(NBTTagList list) return StreamSupport.stream(list.spliterator(), false).flatMap( nbtBase -> LogisticsProgramCompilerTileEntity.programByCategory.get(new ResourceLocation(((NBTTagString) nbtBase).getString())) .stream()) - .filter(it -> TextUtil.translate(Item.REGISTRY.getObject(it).getUnlocalizedName() + ".name").toLowerCase().contains(search.getText().toLowerCase())) + .filter(it -> TextUtil.translate(Item.REGISTRY.getObject(it).getTranslationKey() + ".name").toLowerCase().contains(search.getText().toLowerCase())) .sorted(Comparator.comparing(o -> getSortingClass(Item.REGISTRY.getObject((ResourceLocation) o))) - .thenComparing(o -> TextUtil.translate(Item.REGISTRY.getObject((ResourceLocation) o).getUnlocalizedName() + ".name").toLowerCase()) + .thenComparing(o -> TextUtil.translate(Item.REGISTRY.getObject((ResourceLocation) o).getTranslationKey() + ".name").toLowerCase()) ) .collect(Collectors.toList()); } diff --git a/common/logisticspipes/gui/GuiSatellitePipe.java b/src/main/java/logisticspipes/gui/GuiSatellitePipe.java similarity index 100% rename from common/logisticspipes/gui/GuiSatellitePipe.java rename to src/main/java/logisticspipes/gui/GuiSatellitePipe.java diff --git a/common/logisticspipes/gui/GuiSecurityStation.java b/src/main/java/logisticspipes/gui/GuiSecurityStation.java similarity index 100% rename from common/logisticspipes/gui/GuiSecurityStation.java rename to src/main/java/logisticspipes/gui/GuiSecurityStation.java diff --git a/common/logisticspipes/gui/GuiStatistics.java b/src/main/java/logisticspipes/gui/GuiStatistics.java similarity index 100% rename from common/logisticspipes/gui/GuiStatistics.java rename to src/main/java/logisticspipes/gui/GuiStatistics.java diff --git a/common/logisticspipes/gui/GuiSupplierPipe.java b/src/main/java/logisticspipes/gui/GuiSupplierPipe.java similarity index 100% rename from common/logisticspipes/gui/GuiSupplierPipe.java rename to src/main/java/logisticspipes/gui/GuiSupplierPipe.java diff --git a/common/logisticspipes/gui/ItemAmountSignCreationGui.java b/src/main/java/logisticspipes/gui/ItemAmountSignCreationGui.java similarity index 100% rename from common/logisticspipes/gui/ItemAmountSignCreationGui.java rename to src/main/java/logisticspipes/gui/ItemAmountSignCreationGui.java diff --git a/common/logisticspipes/gui/hud/BasicHUDGui.java b/src/main/java/logisticspipes/gui/hud/BasicHUDGui.java similarity index 100% rename from common/logisticspipes/gui/hud/BasicHUDGui.java rename to src/main/java/logisticspipes/gui/hud/BasicHUDGui.java diff --git a/common/logisticspipes/gui/hud/GuiHUDSettings.java b/src/main/java/logisticspipes/gui/hud/GuiHUDSettings.java similarity index 100% rename from common/logisticspipes/gui/hud/GuiHUDSettings.java rename to src/main/java/logisticspipes/gui/hud/GuiHUDSettings.java diff --git a/common/logisticspipes/gui/hud/HUDCrafting.java b/src/main/java/logisticspipes/gui/hud/HUDCrafting.java similarity index 100% rename from common/logisticspipes/gui/hud/HUDCrafting.java rename to src/main/java/logisticspipes/gui/hud/HUDCrafting.java diff --git a/common/logisticspipes/gui/hud/HUDInvSysConnector.java b/src/main/java/logisticspipes/gui/hud/HUDInvSysConnector.java similarity index 100% rename from common/logisticspipes/gui/hud/HUDInvSysConnector.java rename to src/main/java/logisticspipes/gui/hud/HUDInvSysConnector.java diff --git a/common/logisticspipes/gui/hud/HUDPowerLevel.java b/src/main/java/logisticspipes/gui/hud/HUDPowerLevel.java similarity index 100% rename from common/logisticspipes/gui/hud/HUDPowerLevel.java rename to src/main/java/logisticspipes/gui/hud/HUDPowerLevel.java diff --git a/common/logisticspipes/gui/hud/HUDProvider.java b/src/main/java/logisticspipes/gui/hud/HUDProvider.java similarity index 100% rename from common/logisticspipes/gui/hud/HUDProvider.java rename to src/main/java/logisticspipes/gui/hud/HUDProvider.java diff --git a/common/logisticspipes/gui/hud/HUDSatellite.java b/src/main/java/logisticspipes/gui/hud/HUDSatellite.java similarity index 100% rename from common/logisticspipes/gui/hud/HUDSatellite.java rename to src/main/java/logisticspipes/gui/hud/HUDSatellite.java diff --git a/common/logisticspipes/gui/hud/HudChassisPipe.java b/src/main/java/logisticspipes/gui/hud/HudChassisPipe.java similarity index 100% rename from common/logisticspipes/gui/hud/HudChassisPipe.java rename to src/main/java/logisticspipes/gui/hud/HudChassisPipe.java diff --git a/common/logisticspipes/gui/hud/modules/HUDAdvancedExtractor.java b/src/main/java/logisticspipes/gui/hud/modules/HUDAdvancedExtractor.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDAdvancedExtractor.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDAdvancedExtractor.java diff --git a/common/logisticspipes/gui/hud/modules/HUDItemSink.java b/src/main/java/logisticspipes/gui/hud/modules/HUDItemSink.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDItemSink.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDItemSink.java diff --git a/common/logisticspipes/gui/hud/modules/HUDOreDictItemSink.java b/src/main/java/logisticspipes/gui/hud/modules/HUDOreDictItemSink.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDOreDictItemSink.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDOreDictItemSink.java diff --git a/common/logisticspipes/gui/hud/modules/HUDProviderModule.java b/src/main/java/logisticspipes/gui/hud/modules/HUDProviderModule.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDProviderModule.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDProviderModule.java diff --git a/common/logisticspipes/gui/hud/modules/HUDSimpleFilterModule.java b/src/main/java/logisticspipes/gui/hud/modules/HUDSimpleFilterModule.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDSimpleFilterModule.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDSimpleFilterModule.java diff --git a/common/logisticspipes/gui/hud/modules/HUDStringBasedItemSink.java b/src/main/java/logisticspipes/gui/hud/modules/HUDStringBasedItemSink.java similarity index 100% rename from common/logisticspipes/gui/hud/modules/HUDStringBasedItemSink.java rename to src/main/java/logisticspipes/gui/hud/modules/HUDStringBasedItemSink.java diff --git a/common/logisticspipes/gui/modules/GuiAdvancedExtractor.java b/src/main/java/logisticspipes/gui/modules/GuiAdvancedExtractor.java similarity index 100% rename from common/logisticspipes/gui/modules/GuiAdvancedExtractor.java rename to src/main/java/logisticspipes/gui/modules/GuiAdvancedExtractor.java diff --git a/common/logisticspipes/gui/modules/GuiFluidSupplier.java b/src/main/java/logisticspipes/gui/modules/GuiFluidSupplier.java similarity index 100% rename from common/logisticspipes/gui/modules/GuiFluidSupplier.java rename to src/main/java/logisticspipes/gui/modules/GuiFluidSupplier.java diff --git a/common/logisticspipes/gui/modules/GuiOreDictItemSink.java b/src/main/java/logisticspipes/gui/modules/GuiOreDictItemSink.java similarity index 100% rename from common/logisticspipes/gui/modules/GuiOreDictItemSink.java rename to src/main/java/logisticspipes/gui/modules/GuiOreDictItemSink.java diff --git a/common/logisticspipes/gui/modules/GuiSimpleFilter.java b/src/main/java/logisticspipes/gui/modules/GuiSimpleFilter.java similarity index 100% rename from common/logisticspipes/gui/modules/GuiSimpleFilter.java rename to src/main/java/logisticspipes/gui/modules/GuiSimpleFilter.java diff --git a/common/logisticspipes/gui/modules/GuiSneakyConfigurator.java b/src/main/java/logisticspipes/gui/modules/GuiSneakyConfigurator.java similarity index 97% rename from common/logisticspipes/gui/modules/GuiSneakyConfigurator.java rename to src/main/java/logisticspipes/gui/modules/GuiSneakyConfigurator.java index f44d373e68..a439a18d63 100644 --- a/common/logisticspipes/gui/modules/GuiSneakyConfigurator.java +++ b/src/main/java/logisticspipes/gui/modules/GuiSneakyConfigurator.java @@ -57,13 +57,13 @@ public void initGui() { private void refreshButtons() { for (Object p : buttonList) { GuiButton button = (GuiButton) p; - button.displayString = getButtonOrientationString(button.id == 6 ? null : EnumFacing.getFront(button.id)); + button.displayString = getButtonOrientationString(button.id == 6 ? null : EnumFacing.byIndex(button.id)); } } @Override protected void actionPerformed(GuiButton guibutton) throws IOException { - directionReceiver.setSneakyDirection(guibutton.id == 6 ? null : EnumFacing.getFront(guibutton.id)); + directionReceiver.setSneakyDirection(guibutton.id == 6 ? null : EnumFacing.byIndex(guibutton.id)); MainProxy.sendPacketToServer(PacketHandler.getPacket(SneakyModuleDirectionUpdate.class).setDirection(directionReceiver.getSneakyDirection()).setModulePos(module)); diff --git a/common/logisticspipes/gui/modules/GuiStringBasedItemSink.java b/src/main/java/logisticspipes/gui/modules/GuiStringBasedItemSink.java similarity index 100% rename from common/logisticspipes/gui/modules/GuiStringBasedItemSink.java rename to src/main/java/logisticspipes/gui/modules/GuiStringBasedItemSink.java diff --git a/common/logisticspipes/gui/modules/ModuleBaseGui.java b/src/main/java/logisticspipes/gui/modules/ModuleBaseGui.java similarity index 100% rename from common/logisticspipes/gui/modules/ModuleBaseGui.java rename to src/main/java/logisticspipes/gui/modules/ModuleBaseGui.java diff --git a/common/logisticspipes/gui/orderer/FluidGuiOrderer.java b/src/main/java/logisticspipes/gui/orderer/FluidGuiOrderer.java similarity index 100% rename from common/logisticspipes/gui/orderer/FluidGuiOrderer.java rename to src/main/java/logisticspipes/gui/orderer/FluidGuiOrderer.java diff --git a/common/logisticspipes/gui/orderer/GuiOrderer.java b/src/main/java/logisticspipes/gui/orderer/GuiOrderer.java similarity index 100% rename from common/logisticspipes/gui/orderer/GuiOrderer.java rename to src/main/java/logisticspipes/gui/orderer/GuiOrderer.java diff --git a/common/logisticspipes/gui/orderer/GuiRequestTable.java b/src/main/java/logisticspipes/gui/orderer/GuiRequestTable.java similarity index 96% rename from common/logisticspipes/gui/orderer/GuiRequestTable.java rename to src/main/java/logisticspipes/gui/orderer/GuiRequestTable.java index 568be296da..a9c14d9495 100644 --- a/common/logisticspipes/gui/orderer/GuiRequestTable.java +++ b/src/main/java/logisticspipes/gui/orderer/GuiRequestTable.java @@ -95,13 +95,13 @@ public GuiRequestTable(EntityPlayer entityPlayer, PipeBlockRequestTable table) { } else { dimension = GuiOrderer.dimensioncache; } - DummyContainer dummy = new DummyContainer(entityPlayer.inventory, _table.matrix); + DummyContainer dummy = new DummyContainer(entityPlayer.inventory, _table.getModuleRequesterTable().matrix); dummy.guiHolderForJEI = this; int i = 0; for (int y = 0; y < 3; y++) { for (int x = 0; x < 9; x++) { - dummy.addNormalSlot(i++, _table.inv, guiLeft + (x * 18) + 20, guiTop + (y * 18) + 80); + dummy.addNormalSlot(i++, _table.getModuleRequesterTable().inv, guiLeft + (x * 18) + 20, guiTop + (y * 18) + 80); } } i = 0; @@ -111,8 +111,8 @@ public GuiRequestTable(EntityPlayer entityPlayer, PipeBlockRequestTable table) { } } dummy.addCallableSlotHandler(0, _table.resultInv, guiLeft + 101, guiTop + 33, _table::getResultForClick); - dummy.addNormalSlot(0, _table.toSortInv, guiLeft + 164, guiTop + 51); - dummy.addNormalSlot(0, _table.diskInv, guiLeft + 164, guiTop + 25); + dummy.addNormalSlot(0, _table.getModuleRequesterTable().toSortInv, guiLeft + 164, guiTop + 51); + dummy.addNormalSlot(0, _table.getModuleRequesterTable().diskInv, guiLeft + 164, guiTop + 25); dummy.addNormalSlotsForPlayerInventory(20, 150); inventorySlots = dummy; refreshItems(); @@ -522,12 +522,12 @@ protected void actionPerformed(GuiButton guibutton) { _table.cacheRecipe(); } else if (guibutton.id == 31) { ArrayList list = new ArrayList<>(9); - list.addAll(_table.matrix.getItemsAndCount().entrySet().stream() + list.addAll(_table.getModuleRequesterTable().matrix.getItemsAndCount().entrySet().stream() .map(e -> e.getKey().makeStack(e.getValue())).collect(Collectors.toList())); - for (Pair entry : _table.inv) { - if (entry.getValue1().isEmpty()) continue; - int size = entry.getValue1().getCount(); - ItemIdentifier ident = ItemIdentifier.get(entry.getValue1()); + for (ItemStack itemStack : _table.getModuleRequesterTable().inv) { + if (itemStack.isEmpty()) continue; + int size = itemStack.getCount(); + ItemIdentifier ident = ItemIdentifier.get(itemStack); for (ItemIdentifierStack stack : list) { if (!stack.getItem().equals(ident)) continue; int toUse = Math.min(size, stack.getStackSize()); @@ -545,7 +545,7 @@ protected void actionPerformed(GuiButton guibutton) { private void requestMatrix(int multiplier) { ArrayList list = new ArrayList<>(9); - list.addAll(_table.matrix.getItemsAndCount().entrySet().stream() + list.addAll(_table.getModuleRequesterTable().matrix.getItemsAndCount().entrySet().stream() .map(e -> e.getKey().makeStack(e.getValue() * multiplier)).collect(Collectors.toList())); MainProxy.sendPacketToServer(PacketHandler.getPacket(RequestSubmitListPacket.class).setIdentList(list).setTilePos(_table.container)); refreshItems(); @@ -571,7 +571,8 @@ public void drawGuiContainerForegroundLayer(int par1, int par2) { return; } GuiGraphics.displayItemToolTip(itemDisplay.getToolTip(), this, zLevel, guiLeft, guiTop); - macroButton.enabled = !_table.diskInv.getStackInSlot(0).isEmpty() && _table.diskInv.getStackInSlot(0).getItem().equals(LPItems.disk); + macroButton.enabled = !_table.getModuleRequesterTable().diskInv.getStackInSlot(0).isEmpty() + && _table.getModuleRequesterTable().diskInv.getStackInSlot(0).getItem().equals(LPItems.disk); } @Override @@ -673,7 +674,7 @@ public void resetSubGui() { @Override @Nonnull public ItemStack getDisk() { - return _table.diskInv.getStackInSlot(0); + return _table.getModuleRequesterTable().diskInv.getStackInSlot(0); } @Override diff --git a/common/logisticspipes/gui/orderer/NormalGuiOrderer.java b/src/main/java/logisticspipes/gui/orderer/NormalGuiOrderer.java similarity index 100% rename from common/logisticspipes/gui/orderer/NormalGuiOrderer.java rename to src/main/java/logisticspipes/gui/orderer/NormalGuiOrderer.java diff --git a/common/logisticspipes/gui/orderer/NormalMk2GuiOrderer.java b/src/main/java/logisticspipes/gui/orderer/NormalMk2GuiOrderer.java similarity index 100% rename from common/logisticspipes/gui/orderer/NormalMk2GuiOrderer.java rename to src/main/java/logisticspipes/gui/orderer/NormalMk2GuiOrderer.java diff --git a/common/logisticspipes/gui/popup/ActionChoicePopup.java b/src/main/java/logisticspipes/gui/popup/ActionChoicePopup.java similarity index 100% rename from common/logisticspipes/gui/popup/ActionChoicePopup.java rename to src/main/java/logisticspipes/gui/popup/ActionChoicePopup.java diff --git a/common/logisticspipes/gui/popup/DisconnectionConfigurationPopup.java b/src/main/java/logisticspipes/gui/popup/DisconnectionConfigurationPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/DisconnectionConfigurationPopup.java rename to src/main/java/logisticspipes/gui/popup/DisconnectionConfigurationPopup.java diff --git a/common/logisticspipes/gui/popup/GuiAddChannelPopup.java b/src/main/java/logisticspipes/gui/popup/GuiAddChannelPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiAddChannelPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiAddChannelPopup.java diff --git a/common/logisticspipes/gui/popup/GuiAddMacro.java b/src/main/java/logisticspipes/gui/popup/GuiAddMacro.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiAddMacro.java rename to src/main/java/logisticspipes/gui/popup/GuiAddMacro.java diff --git a/common/logisticspipes/gui/popup/GuiAddTracking.java b/src/main/java/logisticspipes/gui/popup/GuiAddTracking.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiAddTracking.java rename to src/main/java/logisticspipes/gui/popup/GuiAddTracking.java diff --git a/common/logisticspipes/gui/popup/GuiDiskPopup.java b/src/main/java/logisticspipes/gui/popup/GuiDiskPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiDiskPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiDiskPopup.java diff --git a/common/logisticspipes/gui/popup/GuiEditCCAccessTable.java b/src/main/java/logisticspipes/gui/popup/GuiEditCCAccessTable.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiEditCCAccessTable.java rename to src/main/java/logisticspipes/gui/popup/GuiEditCCAccessTable.java diff --git a/common/logisticspipes/gui/popup/GuiEditChannelPopup.java b/src/main/java/logisticspipes/gui/popup/GuiEditChannelPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiEditChannelPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiEditChannelPopup.java diff --git a/common/logisticspipes/gui/popup/GuiManageChannelPopup.java b/src/main/java/logisticspipes/gui/popup/GuiManageChannelPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiManageChannelPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiManageChannelPopup.java diff --git a/common/logisticspipes/gui/popup/GuiMessagePopup.java b/src/main/java/logisticspipes/gui/popup/GuiMessagePopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiMessagePopup.java rename to src/main/java/logisticspipes/gui/popup/GuiMessagePopup.java diff --git a/common/logisticspipes/gui/popup/GuiRecipeImport.java b/src/main/java/logisticspipes/gui/popup/GuiRecipeImport.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiRecipeImport.java rename to src/main/java/logisticspipes/gui/popup/GuiRecipeImport.java diff --git a/common/logisticspipes/gui/popup/GuiRequestPopup.java b/src/main/java/logisticspipes/gui/popup/GuiRequestPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiRequestPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiRequestPopup.java diff --git a/common/logisticspipes/gui/popup/GuiSecurityStationPopup.java b/src/main/java/logisticspipes/gui/popup/GuiSecurityStationPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiSecurityStationPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiSecurityStationPopup.java diff --git a/common/logisticspipes/gui/popup/GuiSelectChannelPopup.java b/src/main/java/logisticspipes/gui/popup/GuiSelectChannelPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiSelectChannelPopup.java rename to src/main/java/logisticspipes/gui/popup/GuiSelectChannelPopup.java diff --git a/common/logisticspipes/gui/popup/GuiSelectSatellitePopup.java b/src/main/java/logisticspipes/gui/popup/GuiSelectSatellitePopup.java similarity index 100% rename from common/logisticspipes/gui/popup/GuiSelectSatellitePopup.java rename to src/main/java/logisticspipes/gui/popup/GuiSelectSatellitePopup.java diff --git a/common/logisticspipes/gui/popup/RequestMonitorPopup.java b/src/main/java/logisticspipes/gui/popup/RequestMonitorPopup.java similarity index 99% rename from common/logisticspipes/gui/popup/RequestMonitorPopup.java rename to src/main/java/logisticspipes/gui/popup/RequestMonitorPopup.java index d35be350e6..dbd5382817 100644 --- a/common/logisticspipes/gui/popup/RequestMonitorPopup.java +++ b/src/main/java/logisticspipes/gui/popup/RequestMonitorPopup.java @@ -271,7 +271,7 @@ private void saveTreeToImage() { } private void saveImage(BufferedImage bufferedimage) { - File screenShotsFolder = new File(Minecraft.getMinecraft().mcDataDir, "screenshots"); + File screenShotsFolder = new File(Minecraft.getMinecraft().gameDir, "screenshots"); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss"); String s = dateFormat.format(new Date()); int i = 1; diff --git a/common/logisticspipes/gui/popup/SelectItemOutOfList.java b/src/main/java/logisticspipes/gui/popup/SelectItemOutOfList.java similarity index 100% rename from common/logisticspipes/gui/popup/SelectItemOutOfList.java rename to src/main/java/logisticspipes/gui/popup/SelectItemOutOfList.java diff --git a/common/logisticspipes/gui/popup/SneakyConfigurationPopup.java b/src/main/java/logisticspipes/gui/popup/SneakyConfigurationPopup.java similarity index 100% rename from common/logisticspipes/gui/popup/SneakyConfigurationPopup.java rename to src/main/java/logisticspipes/gui/popup/SneakyConfigurationPopup.java diff --git a/common/logisticspipes/hud/HUDConfig.java b/src/main/java/logisticspipes/hud/HUDConfig.java similarity index 98% rename from common/logisticspipes/hud/HUDConfig.java rename to src/main/java/logisticspipes/hud/HUDConfig.java index 12ed132e93..1028af8ad1 100644 --- a/common/logisticspipes/hud/HUDConfig.java +++ b/src/main/java/logisticspipes/hud/HUDConfig.java @@ -22,7 +22,7 @@ public HUDConfig(NBTTagCompound tag) { configTag = new NBTTagCompound(); } - if (configTag.hasNoTags()) { + if (configTag.isEmpty()) { configTag.setBoolean("HUDChassie", true); configTag.setBoolean("HUDCrafting", true); configTag.setBoolean("HUDInvSysCon", true); diff --git a/common/logisticspipes/interfaces/IBlockWatchingHandler.java b/src/main/java/logisticspipes/interfaces/IBlockWatchingHandler.java similarity index 100% rename from common/logisticspipes/interfaces/IBlockWatchingHandler.java rename to src/main/java/logisticspipes/interfaces/IBlockWatchingHandler.java diff --git a/common/logisticspipes/interfaces/IBufferItems.java b/src/main/java/logisticspipes/interfaces/IBufferItems.java similarity index 100% rename from common/logisticspipes/interfaces/IBufferItems.java rename to src/main/java/logisticspipes/interfaces/IBufferItems.java diff --git a/common/logisticspipes/interfaces/IChainAddList.java b/src/main/java/logisticspipes/interfaces/IChainAddList.java similarity index 100% rename from common/logisticspipes/interfaces/IChainAddList.java rename to src/main/java/logisticspipes/interfaces/IChainAddList.java diff --git a/common/logisticspipes/interfaces/IChangeListener.java b/src/main/java/logisticspipes/interfaces/IChangeListener.java similarity index 100% rename from common/logisticspipes/interfaces/IChangeListener.java rename to src/main/java/logisticspipes/interfaces/IChangeListener.java diff --git a/common/logisticspipes/interfaces/IChestContentReceiver.java b/src/main/java/logisticspipes/interfaces/IChestContentReceiver.java similarity index 100% rename from common/logisticspipes/interfaces/IChestContentReceiver.java rename to src/main/java/logisticspipes/interfaces/IChestContentReceiver.java diff --git a/common/logisticspipes/interfaces/IClientInformationProvider.java b/src/main/java/logisticspipes/interfaces/IClientInformationProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IClientInformationProvider.java rename to src/main/java/logisticspipes/interfaces/IClientInformationProvider.java diff --git a/common/logisticspipes/interfaces/IClientState.java b/src/main/java/logisticspipes/interfaces/IClientState.java similarity index 100% rename from common/logisticspipes/interfaces/IClientState.java rename to src/main/java/logisticspipes/interfaces/IClientState.java diff --git a/common/logisticspipes/interfaces/IDebugHUDProvider.java b/src/main/java/logisticspipes/interfaces/IDebugHUDProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IDebugHUDProvider.java rename to src/main/java/logisticspipes/interfaces/IDebugHUDProvider.java diff --git a/common/logisticspipes/interfaces/IDiskProvider.java b/src/main/java/logisticspipes/interfaces/IDiskProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IDiskProvider.java rename to src/main/java/logisticspipes/interfaces/IDiskProvider.java diff --git a/common/logisticspipes/interfaces/IFuzzySlot.java b/src/main/java/logisticspipes/interfaces/IFuzzySlot.java similarity index 100% rename from common/logisticspipes/interfaces/IFuzzySlot.java rename to src/main/java/logisticspipes/interfaces/IFuzzySlot.java diff --git a/common/logisticspipes/interfaces/IGUIChannelInformationReceiver.java b/src/main/java/logisticspipes/interfaces/IGUIChannelInformationReceiver.java similarity index 100% rename from common/logisticspipes/interfaces/IGUIChannelInformationReceiver.java rename to src/main/java/logisticspipes/interfaces/IGUIChannelInformationReceiver.java diff --git a/common/logisticspipes/interfaces/IGuiOpenControler.java b/src/main/java/logisticspipes/interfaces/IGuiOpenControler.java similarity index 100% rename from common/logisticspipes/interfaces/IGuiOpenControler.java rename to src/main/java/logisticspipes/interfaces/IGuiOpenControler.java diff --git a/common/logisticspipes/interfaces/IGuiTileEntity.java b/src/main/java/logisticspipes/interfaces/IGuiTileEntity.java similarity index 100% rename from common/logisticspipes/interfaces/IGuiTileEntity.java rename to src/main/java/logisticspipes/interfaces/IGuiTileEntity.java diff --git a/common/logisticspipes/interfaces/IHUDButton.java b/src/main/java/logisticspipes/interfaces/IHUDButton.java similarity index 100% rename from common/logisticspipes/interfaces/IHUDButton.java rename to src/main/java/logisticspipes/interfaces/IHUDButton.java diff --git a/common/logisticspipes/interfaces/IHUDConfig.java b/src/main/java/logisticspipes/interfaces/IHUDConfig.java similarity index 100% rename from common/logisticspipes/interfaces/IHUDConfig.java rename to src/main/java/logisticspipes/interfaces/IHUDConfig.java diff --git a/common/logisticspipes/interfaces/IHUDModuleHandler.java b/src/main/java/logisticspipes/interfaces/IHUDModuleHandler.java similarity index 100% rename from common/logisticspipes/interfaces/IHUDModuleHandler.java rename to src/main/java/logisticspipes/interfaces/IHUDModuleHandler.java diff --git a/common/logisticspipes/interfaces/IHUDModuleRenderer.java b/src/main/java/logisticspipes/interfaces/IHUDModuleRenderer.java similarity index 100% rename from common/logisticspipes/interfaces/IHUDModuleRenderer.java rename to src/main/java/logisticspipes/interfaces/IHUDModuleRenderer.java diff --git a/common/logisticspipes/interfaces/IHeadUpDisplayBlockRendererProvider.java b/src/main/java/logisticspipes/interfaces/IHeadUpDisplayBlockRendererProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IHeadUpDisplayBlockRendererProvider.java rename to src/main/java/logisticspipes/interfaces/IHeadUpDisplayBlockRendererProvider.java diff --git a/common/logisticspipes/interfaces/IHeadUpDisplayRenderer.java b/src/main/java/logisticspipes/interfaces/IHeadUpDisplayRenderer.java similarity index 100% rename from common/logisticspipes/interfaces/IHeadUpDisplayRenderer.java rename to src/main/java/logisticspipes/interfaces/IHeadUpDisplayRenderer.java diff --git a/common/logisticspipes/interfaces/IHeadUpDisplayRendererProvider.java b/src/main/java/logisticspipes/interfaces/IHeadUpDisplayRendererProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IHeadUpDisplayRendererProvider.java rename to src/main/java/logisticspipes/interfaces/IHeadUpDisplayRendererProvider.java diff --git a/common/logisticspipes/interfaces/IInventoryUtil.java b/src/main/java/logisticspipes/interfaces/IInventoryUtil.java similarity index 100% rename from common/logisticspipes/interfaces/IInventoryUtil.java rename to src/main/java/logisticspipes/interfaces/IInventoryUtil.java diff --git a/common/logisticspipes/interfaces/IItemAdvancedExistance.java b/src/main/java/logisticspipes/interfaces/IItemAdvancedExistance.java similarity index 100% rename from common/logisticspipes/interfaces/IItemAdvancedExistance.java rename to src/main/java/logisticspipes/interfaces/IItemAdvancedExistance.java diff --git a/common/logisticspipes/interfaces/ILPItemAcceptor.java b/src/main/java/logisticspipes/interfaces/ILPItemAcceptor.java similarity index 100% rename from common/logisticspipes/interfaces/ILPItemAcceptor.java rename to src/main/java/logisticspipes/interfaces/ILPItemAcceptor.java diff --git a/common/logisticspipes/interfaces/ILPPositionProvider.java b/src/main/java/logisticspipes/interfaces/ILPPositionProvider.java similarity index 100% rename from common/logisticspipes/interfaces/ILPPositionProvider.java rename to src/main/java/logisticspipes/interfaces/ILPPositionProvider.java diff --git a/common/logisticspipes/interfaces/ILegacyActiveModule.java b/src/main/java/logisticspipes/interfaces/ILegacyActiveModule.java similarity index 100% rename from common/logisticspipes/interfaces/ILegacyActiveModule.java rename to src/main/java/logisticspipes/interfaces/ILegacyActiveModule.java diff --git a/common/logisticspipes/interfaces/ILogisticsItem.java b/src/main/java/logisticspipes/interfaces/ILogisticsItem.java similarity index 87% rename from common/logisticspipes/interfaces/ILogisticsItem.java rename to src/main/java/logisticspipes/interfaces/ILogisticsItem.java index ee3dec02df..f0fc460061 100644 --- a/common/logisticspipes/interfaces/ILogisticsItem.java +++ b/src/main/java/logisticspipes/interfaces/ILogisticsItem.java @@ -7,7 +7,7 @@ public interface ILogisticsItem { default String getModelPath() { - return getItem().getRegistryName().getResourcePath(); + return getItem().getRegistryName().getPath(); } default int getModelCount() { diff --git a/common/logisticspipes/interfaces/IModuleInventoryReceive.java b/src/main/java/logisticspipes/interfaces/IModuleInventoryReceive.java similarity index 100% rename from common/logisticspipes/interfaces/IModuleInventoryReceive.java rename to src/main/java/logisticspipes/interfaces/IModuleInventoryReceive.java diff --git a/common/logisticspipes/interfaces/IModuleWatchReciver.java b/src/main/java/logisticspipes/interfaces/IModuleWatchReciver.java similarity index 100% rename from common/logisticspipes/interfaces/IModuleWatchReciver.java rename to src/main/java/logisticspipes/interfaces/IModuleWatchReciver.java diff --git a/common/logisticspipes/interfaces/IOrderManagerContentReceiver.java b/src/main/java/logisticspipes/interfaces/IOrderManagerContentReceiver.java similarity index 100% rename from common/logisticspipes/interfaces/IOrderManagerContentReceiver.java rename to src/main/java/logisticspipes/interfaces/IOrderManagerContentReceiver.java diff --git a/common/logisticspipes/interfaces/IPipeServiceProvider.java b/src/main/java/logisticspipes/interfaces/IPipeServiceProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IPipeServiceProvider.java rename to src/main/java/logisticspipes/interfaces/IPipeServiceProvider.java diff --git a/common/logisticspipes/interfaces/IPipeUpgradeManager.java b/src/main/java/logisticspipes/interfaces/IPipeUpgradeManager.java similarity index 100% rename from common/logisticspipes/interfaces/IPipeUpgradeManager.java rename to src/main/java/logisticspipes/interfaces/IPipeUpgradeManager.java diff --git a/common/logisticspipes/interfaces/IPowerLevelDisplay.java b/src/main/java/logisticspipes/interfaces/IPowerLevelDisplay.java similarity index 100% rename from common/logisticspipes/interfaces/IPowerLevelDisplay.java rename to src/main/java/logisticspipes/interfaces/IPowerLevelDisplay.java diff --git a/common/logisticspipes/interfaces/IQueueCCEvent.java b/src/main/java/logisticspipes/interfaces/IQueueCCEvent.java similarity index 100% rename from common/logisticspipes/interfaces/IQueueCCEvent.java rename to src/main/java/logisticspipes/interfaces/IQueueCCEvent.java diff --git a/common/logisticspipes/interfaces/IRequestWatcher.java b/src/main/java/logisticspipes/interfaces/IRequestWatcher.java similarity index 100% rename from common/logisticspipes/interfaces/IRequestWatcher.java rename to src/main/java/logisticspipes/interfaces/IRequestWatcher.java diff --git a/common/logisticspipes/interfaces/IRotationProvider.java b/src/main/java/logisticspipes/interfaces/IRotationProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IRotationProvider.java rename to src/main/java/logisticspipes/interfaces/IRotationProvider.java diff --git a/common/logisticspipes/interfaces/IRoutingDebugAdapter.java b/src/main/java/logisticspipes/interfaces/IRoutingDebugAdapter.java similarity index 100% rename from common/logisticspipes/interfaces/IRoutingDebugAdapter.java rename to src/main/java/logisticspipes/interfaces/IRoutingDebugAdapter.java diff --git a/common/logisticspipes/interfaces/ISecurityProvider.java b/src/main/java/logisticspipes/interfaces/ISecurityProvider.java similarity index 100% rename from common/logisticspipes/interfaces/ISecurityProvider.java rename to src/main/java/logisticspipes/interfaces/ISecurityProvider.java diff --git a/common/logisticspipes/interfaces/ISecurityStationManager.java b/src/main/java/logisticspipes/interfaces/ISecurityStationManager.java similarity index 100% rename from common/logisticspipes/interfaces/ISecurityStationManager.java rename to src/main/java/logisticspipes/interfaces/ISecurityStationManager.java diff --git a/common/logisticspipes/interfaces/ISendQueueContentRecieiver.java b/src/main/java/logisticspipes/interfaces/ISendQueueContentRecieiver.java similarity index 100% rename from common/logisticspipes/interfaces/ISendQueueContentRecieiver.java rename to src/main/java/logisticspipes/interfaces/ISendQueueContentRecieiver.java diff --git a/common/logisticspipes/interfaces/ISendRoutedItem.java b/src/main/java/logisticspipes/interfaces/ISendRoutedItem.java similarity index 100% rename from common/logisticspipes/interfaces/ISendRoutedItem.java rename to src/main/java/logisticspipes/interfaces/ISendRoutedItem.java diff --git a/common/logisticspipes/interfaces/ISlotCheck.java b/src/main/java/logisticspipes/interfaces/ISlotCheck.java similarity index 100% rename from common/logisticspipes/interfaces/ISlotCheck.java rename to src/main/java/logisticspipes/interfaces/ISlotCheck.java diff --git a/common/logisticspipes/interfaces/ISlotClick.java b/src/main/java/logisticspipes/interfaces/ISlotClick.java similarity index 100% rename from common/logisticspipes/interfaces/ISlotClick.java rename to src/main/java/logisticspipes/interfaces/ISlotClick.java diff --git a/common/logisticspipes/interfaces/ISlotUpgradeManager.java b/src/main/java/logisticspipes/interfaces/ISlotUpgradeManager.java similarity index 100% rename from common/logisticspipes/interfaces/ISlotUpgradeManager.java rename to src/main/java/logisticspipes/interfaces/ISlotUpgradeManager.java diff --git a/common/logisticspipes/interfaces/ISpawnParticles.java b/src/main/java/logisticspipes/interfaces/ISpawnParticles.java similarity index 100% rename from common/logisticspipes/interfaces/ISpawnParticles.java rename to src/main/java/logisticspipes/interfaces/ISpawnParticles.java diff --git a/common/logisticspipes/interfaces/ISpecialInsertion.java b/src/main/java/logisticspipes/interfaces/ISpecialInsertion.java similarity index 100% rename from common/logisticspipes/interfaces/ISpecialInsertion.java rename to src/main/java/logisticspipes/interfaces/ISpecialInsertion.java diff --git a/common/logisticspipes/interfaces/ISpecialItemRenderer.java b/src/main/java/logisticspipes/interfaces/ISpecialItemRenderer.java similarity index 100% rename from common/logisticspipes/interfaces/ISpecialItemRenderer.java rename to src/main/java/logisticspipes/interfaces/ISpecialItemRenderer.java diff --git a/common/logisticspipes/interfaces/ISpecialTankAccessHandler.java b/src/main/java/logisticspipes/interfaces/ISpecialTankAccessHandler.java similarity index 100% rename from common/logisticspipes/interfaces/ISpecialTankAccessHandler.java rename to src/main/java/logisticspipes/interfaces/ISpecialTankAccessHandler.java diff --git a/common/logisticspipes/interfaces/ISpecialTankHandler.java b/src/main/java/logisticspipes/interfaces/ISpecialTankHandler.java similarity index 100% rename from common/logisticspipes/interfaces/ISpecialTankHandler.java rename to src/main/java/logisticspipes/interfaces/ISpecialTankHandler.java diff --git a/common/logisticspipes/interfaces/ISpecialTankUtil.java b/src/main/java/logisticspipes/interfaces/ISpecialTankUtil.java similarity index 100% rename from common/logisticspipes/interfaces/ISpecialTankUtil.java rename to src/main/java/logisticspipes/interfaces/ISpecialTankUtil.java diff --git a/common/logisticspipes/interfaces/IStringBasedModule.java b/src/main/java/logisticspipes/interfaces/IStringBasedModule.java similarity index 100% rename from common/logisticspipes/interfaces/IStringBasedModule.java rename to src/main/java/logisticspipes/interfaces/IStringBasedModule.java diff --git a/common/logisticspipes/interfaces/ISubSystemPowerProvider.java b/src/main/java/logisticspipes/interfaces/ISubSystemPowerProvider.java similarity index 100% rename from common/logisticspipes/interfaces/ISubSystemPowerProvider.java rename to src/main/java/logisticspipes/interfaces/ISubSystemPowerProvider.java diff --git a/common/logisticspipes/interfaces/ITankUtil.java b/src/main/java/logisticspipes/interfaces/ITankUtil.java similarity index 100% rename from common/logisticspipes/interfaces/ITankUtil.java rename to src/main/java/logisticspipes/interfaces/ITankUtil.java diff --git a/common/logisticspipes/interfaces/ITileEntityPart.java b/src/main/java/logisticspipes/interfaces/ITileEntityPart.java similarity index 100% rename from common/logisticspipes/interfaces/ITileEntityPart.java rename to src/main/java/logisticspipes/interfaces/ITileEntityPart.java diff --git a/common/logisticspipes/interfaces/ITubeOrientation.java b/src/main/java/logisticspipes/interfaces/ITubeOrientation.java similarity index 100% rename from common/logisticspipes/interfaces/ITubeOrientation.java rename to src/main/java/logisticspipes/interfaces/ITubeOrientation.java diff --git a/common/logisticspipes/interfaces/ITubeRenderOrientation.java b/src/main/java/logisticspipes/interfaces/ITubeRenderOrientation.java similarity index 100% rename from common/logisticspipes/interfaces/ITubeRenderOrientation.java rename to src/main/java/logisticspipes/interfaces/ITubeRenderOrientation.java diff --git a/common/logisticspipes/interfaces/IWatchingHandler.java b/src/main/java/logisticspipes/interfaces/IWatchingHandler.java similarity index 100% rename from common/logisticspipes/interfaces/IWatchingHandler.java rename to src/main/java/logisticspipes/interfaces/IWatchingHandler.java diff --git a/common/logisticspipes/interfaces/IWorldProvider.java b/src/main/java/logisticspipes/interfaces/IWorldProvider.java similarity index 100% rename from common/logisticspipes/interfaces/IWorldProvider.java rename to src/main/java/logisticspipes/interfaces/IWorldProvider.java diff --git a/common/logisticspipes/interfaces/PlayerListReciver.java b/src/main/java/logisticspipes/interfaces/PlayerListReciver.java similarity index 100% rename from common/logisticspipes/interfaces/PlayerListReciver.java rename to src/main/java/logisticspipes/interfaces/PlayerListReciver.java diff --git a/common/logisticspipes/interfaces/routing/IAdditionalTargetInformation.java b/src/main/java/logisticspipes/interfaces/routing/IAdditionalTargetInformation.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IAdditionalTargetInformation.java rename to src/main/java/logisticspipes/interfaces/routing/IAdditionalTargetInformation.java diff --git a/common/logisticspipes/interfaces/routing/IChannelConnectionManager.java b/src/main/java/logisticspipes/interfaces/routing/IChannelConnectionManager.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IChannelConnectionManager.java rename to src/main/java/logisticspipes/interfaces/routing/IChannelConnectionManager.java diff --git a/common/logisticspipes/interfaces/routing/IChannelManager.java b/src/main/java/logisticspipes/interfaces/routing/IChannelManager.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IChannelManager.java rename to src/main/java/logisticspipes/interfaces/routing/IChannelManager.java diff --git a/common/logisticspipes/interfaces/routing/IChannelManagerProvider.java b/src/main/java/logisticspipes/interfaces/routing/IChannelManagerProvider.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IChannelManagerProvider.java rename to src/main/java/logisticspipes/interfaces/routing/IChannelManagerProvider.java diff --git a/common/logisticspipes/interfaces/routing/IChannelRoutingConnection.java b/src/main/java/logisticspipes/interfaces/routing/IChannelRoutingConnection.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IChannelRoutingConnection.java rename to src/main/java/logisticspipes/interfaces/routing/IChannelRoutingConnection.java diff --git a/common/logisticspipes/interfaces/routing/ICraft.java b/src/main/java/logisticspipes/interfaces/routing/ICraft.java similarity index 100% rename from common/logisticspipes/interfaces/routing/ICraft.java rename to src/main/java/logisticspipes/interfaces/routing/ICraft.java diff --git a/common/logisticspipes/interfaces/routing/ICraftItems.java b/src/main/java/logisticspipes/interfaces/routing/ICraftItems.java similarity index 100% rename from common/logisticspipes/interfaces/routing/ICraftItems.java rename to src/main/java/logisticspipes/interfaces/routing/ICraftItems.java diff --git a/common/logisticspipes/interfaces/routing/IFilter.java b/src/main/java/logisticspipes/interfaces/routing/IFilter.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IFilter.java rename to src/main/java/logisticspipes/interfaces/routing/IFilter.java diff --git a/common/logisticspipes/interfaces/routing/IFilteringPipe.java b/src/main/java/logisticspipes/interfaces/routing/IFilteringPipe.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IFilteringPipe.java rename to src/main/java/logisticspipes/interfaces/routing/IFilteringPipe.java diff --git a/common/logisticspipes/interfaces/routing/IFluidSink.java b/src/main/java/logisticspipes/interfaces/routing/IFluidSink.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IFluidSink.java rename to src/main/java/logisticspipes/interfaces/routing/IFluidSink.java diff --git a/common/logisticspipes/interfaces/routing/IItemSpaceControl.java b/src/main/java/logisticspipes/interfaces/routing/IItemSpaceControl.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IItemSpaceControl.java rename to src/main/java/logisticspipes/interfaces/routing/IItemSpaceControl.java diff --git a/common/logisticspipes/interfaces/routing/IProvide.java b/src/main/java/logisticspipes/interfaces/routing/IProvide.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IProvide.java rename to src/main/java/logisticspipes/interfaces/routing/IProvide.java diff --git a/common/logisticspipes/interfaces/routing/IProvideFluids.java b/src/main/java/logisticspipes/interfaces/routing/IProvideFluids.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IProvideFluids.java rename to src/main/java/logisticspipes/interfaces/routing/IProvideFluids.java diff --git a/common/logisticspipes/interfaces/routing/IProvideItems.java b/src/main/java/logisticspipes/interfaces/routing/IProvideItems.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IProvideItems.java rename to src/main/java/logisticspipes/interfaces/routing/IProvideItems.java diff --git a/common/logisticspipes/interfaces/routing/IRequest.java b/src/main/java/logisticspipes/interfaces/routing/IRequest.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IRequest.java rename to src/main/java/logisticspipes/interfaces/routing/IRequest.java diff --git a/common/logisticspipes/interfaces/routing/IRequestFluid.java b/src/main/java/logisticspipes/interfaces/routing/IRequestFluid.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IRequestFluid.java rename to src/main/java/logisticspipes/interfaces/routing/IRequestFluid.java diff --git a/common/logisticspipes/interfaces/routing/IRequestItems.java b/src/main/java/logisticspipes/interfaces/routing/IRequestItems.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IRequestItems.java rename to src/main/java/logisticspipes/interfaces/routing/IRequestItems.java diff --git a/common/logisticspipes/interfaces/routing/IRequireReliableFluidTransport.java b/src/main/java/logisticspipes/interfaces/routing/IRequireReliableFluidTransport.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IRequireReliableFluidTransport.java rename to src/main/java/logisticspipes/interfaces/routing/IRequireReliableFluidTransport.java diff --git a/common/logisticspipes/interfaces/routing/IRequireReliableTransport.java b/src/main/java/logisticspipes/interfaces/routing/IRequireReliableTransport.java similarity index 100% rename from common/logisticspipes/interfaces/routing/IRequireReliableTransport.java rename to src/main/java/logisticspipes/interfaces/routing/IRequireReliableTransport.java diff --git a/common/logisticspipes/interfaces/routing/ISpecialPipedConnection.java b/src/main/java/logisticspipes/interfaces/routing/ISpecialPipedConnection.java similarity index 100% rename from common/logisticspipes/interfaces/routing/ISpecialPipedConnection.java rename to src/main/java/logisticspipes/interfaces/routing/ISpecialPipedConnection.java diff --git a/common/logisticspipes/interfaces/routing/ISpecialTileConnection.java b/src/main/java/logisticspipes/interfaces/routing/ISpecialTileConnection.java similarity index 100% rename from common/logisticspipes/interfaces/routing/ISpecialTileConnection.java rename to src/main/java/logisticspipes/interfaces/routing/ISpecialTileConnection.java diff --git a/common/logisticspipes/interfaces/routing/ITargetSlotInformation.java b/src/main/java/logisticspipes/interfaces/routing/ITargetSlotInformation.java similarity index 100% rename from common/logisticspipes/interfaces/routing/ITargetSlotInformation.java rename to src/main/java/logisticspipes/interfaces/routing/ITargetSlotInformation.java diff --git a/common/logisticspipes/items/ItemBlankModule.java b/src/main/java/logisticspipes/items/ItemBlankModule.java similarity index 100% rename from common/logisticspipes/items/ItemBlankModule.java rename to src/main/java/logisticspipes/items/ItemBlankModule.java diff --git a/common/logisticspipes/items/ItemDisk.java b/src/main/java/logisticspipes/items/ItemDisk.java similarity index 100% rename from common/logisticspipes/items/ItemDisk.java rename to src/main/java/logisticspipes/items/ItemDisk.java diff --git a/common/logisticspipes/items/ItemHUDArmor.java b/src/main/java/logisticspipes/items/ItemHUDArmor.java similarity index 97% rename from common/logisticspipes/items/ItemHUDArmor.java rename to src/main/java/logisticspipes/items/ItemHUDArmor.java index 0a2bf58182..fcbcf5a8c2 100644 --- a/common/logisticspipes/items/ItemHUDArmor.java +++ b/src/main/java/logisticspipes/items/ItemHUDArmor.java @@ -97,7 +97,7 @@ public String getArmorTexture(@Nonnull ItemStack stack, Entity entity, EntityEqu @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - return I18n.translateToLocal(getUnlocalizedName(itemstack) + ".name").trim(); + return I18n.translateToLocal(getTranslationKey(itemstack) + ".name").trim(); } } diff --git a/common/logisticspipes/items/ItemLogisticsChips.java b/src/main/java/logisticspipes/items/ItemLogisticsChips.java similarity index 100% rename from common/logisticspipes/items/ItemLogisticsChips.java rename to src/main/java/logisticspipes/items/ItemLogisticsChips.java diff --git a/common/logisticspipes/items/ItemLogisticsPipe.java b/src/main/java/logisticspipes/items/ItemLogisticsPipe.java similarity index 100% rename from common/logisticspipes/items/ItemLogisticsPipe.java rename to src/main/java/logisticspipes/items/ItemLogisticsPipe.java diff --git a/common/logisticspipes/items/ItemLogisticsProgrammer.java b/src/main/java/logisticspipes/items/ItemLogisticsProgrammer.java similarity index 90% rename from common/logisticspipes/items/ItemLogisticsProgrammer.java rename to src/main/java/logisticspipes/items/ItemLogisticsProgrammer.java index 3867edab48..23cdcfad17 100644 --- a/common/logisticspipes/items/ItemLogisticsProgrammer.java +++ b/src/main/java/logisticspipes/items/ItemLogisticsProgrammer.java @@ -45,13 +45,13 @@ public void addInformation(@Nonnull ItemStack stack, @Nullable World worldIn, Li Item targetItem = REGISTRY.getObject(new ResourceLocation(target)); if (targetItem instanceof ItemModule) { tooltip.add(TextUtil.translate("tooltip.programmerForModule")); - tooltip.add(TextUtil.translate(targetItem.getUnlocalizedName() + ".name")); + tooltip.add(TextUtil.translate(targetItem.getTranslationKey() + ".name")); } else if (targetItem instanceof ItemUpgrade) { tooltip.add(TextUtil.translate("tooltip.programmerForUpgrade")); - tooltip.add(TextUtil.translate(targetItem.getUnlocalizedName() + ".name")); + tooltip.add(TextUtil.translate(targetItem.getTranslationKey() + ".name")); } else if (targetItem instanceof ItemLogisticsPipe) { tooltip.add(TextUtil.translate("tooltip.programmerForPipe")); - tooltip.add(TextUtil.translate(targetItem.getUnlocalizedName() + ".name")); + tooltip.add(TextUtil.translate(targetItem.getTranslationKey() + ".name")); } else { tooltip.add(TextUtil.translate("tooltip.programmerForUnknown.1")); tooltip.add(TextUtil.translate("tooltip.programmerForUnknown.2")); diff --git a/common/logisticspipes/items/ItemModule.java b/src/main/java/logisticspipes/items/ItemModule.java similarity index 100% rename from common/logisticspipes/items/ItemModule.java rename to src/main/java/logisticspipes/items/ItemModule.java diff --git a/common/logisticspipes/items/ItemParts.java b/src/main/java/logisticspipes/items/ItemParts.java similarity index 100% rename from common/logisticspipes/items/ItemParts.java rename to src/main/java/logisticspipes/items/ItemParts.java diff --git a/common/logisticspipes/items/ItemPipeController.java b/src/main/java/logisticspipes/items/ItemPipeController.java similarity index 100% rename from common/logisticspipes/items/ItemPipeController.java rename to src/main/java/logisticspipes/items/ItemPipeController.java diff --git a/common/logisticspipes/items/ItemPipeManager.java b/src/main/java/logisticspipes/items/ItemPipeManager.java similarity index 100% rename from common/logisticspipes/items/ItemPipeManager.java rename to src/main/java/logisticspipes/items/ItemPipeManager.java diff --git a/common/logisticspipes/items/ItemPipeSignCreator.java b/src/main/java/logisticspipes/items/ItemPipeSignCreator.java similarity index 100% rename from common/logisticspipes/items/ItemPipeSignCreator.java rename to src/main/java/logisticspipes/items/ItemPipeSignCreator.java diff --git a/common/logisticspipes/items/ItemUpgrade.java b/src/main/java/logisticspipes/items/ItemUpgrade.java similarity index 100% rename from common/logisticspipes/items/ItemUpgrade.java rename to src/main/java/logisticspipes/items/ItemUpgrade.java diff --git a/common/logisticspipes/items/LogisticsBrokenItem.java b/src/main/java/logisticspipes/items/LogisticsBrokenItem.java similarity index 100% rename from common/logisticspipes/items/LogisticsBrokenItem.java rename to src/main/java/logisticspipes/items/LogisticsBrokenItem.java diff --git a/common/logisticspipes/items/LogisticsFluidContainer.java b/src/main/java/logisticspipes/items/LogisticsFluidContainer.java similarity index 94% rename from common/logisticspipes/items/LogisticsFluidContainer.java rename to src/main/java/logisticspipes/items/LogisticsFluidContainer.java index dc3f4ab3ad..e5a42c804d 100644 --- a/common/logisticspipes/items/LogisticsFluidContainer.java +++ b/src/main/java/logisticspipes/items/LogisticsFluidContainer.java @@ -41,7 +41,7 @@ public boolean canExistInWorld(@Nonnull ItemStack stack) { @Override @Nonnull - public String getUnlocalizedName(@Nonnull ItemStack stack) { + public String getTranslationKey(@Nonnull ItemStack stack) { FluidIdentifierStack fluidStack = SimpleServiceLocator.logisticsFluidManager.getFluidFromContainer(ItemIdentifierStack.getFromStack(stack)); if (fluidStack != null) { String s = fluidStack.makeFluidStack().getFluid().getUnlocalizedName(); @@ -49,13 +49,13 @@ public String getUnlocalizedName(@Nonnull ItemStack stack) { return s; } } - return super.getUnlocalizedName(stack); + return super.getTranslationKey(stack); } @Override @Nonnull public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - String unLocalizedName = getUnlocalizedName(itemstack); + String unLocalizedName = getTranslationKey(itemstack); String unLocalizedNameInefficiently = getUnlocalizedNameInefficiently(itemstack); // Fix for Logistics fluid container naming return I18n.translateToLocal(unLocalizedName + (unLocalizedName.equals(unLocalizedNameInefficiently) ? ".name" : "")).trim(); } diff --git a/common/logisticspipes/items/LogisticsItem.java b/src/main/java/logisticspipes/items/LogisticsItem.java similarity index 87% rename from common/logisticspipes/items/LogisticsItem.java rename to src/main/java/logisticspipes/items/LogisticsItem.java index 0986257506..fdce0d6ca2 100644 --- a/common/logisticspipes/items/LogisticsItem.java +++ b/src/main/java/logisticspipes/items/LogisticsItem.java @@ -35,7 +35,7 @@ public LogisticsItem() { @Override public String getModelPath() { - String modelFile = getRegistryName().getResourcePath(); + String modelFile = getRegistryName().getPath(); String dir = getModelSubdir(); if (!dir.isEmpty()) { if (modelFile.startsWith(String.format("%s_", dir))) { @@ -56,11 +56,11 @@ public int getModelCount() { @Nonnull @Override - public String getUnlocalizedName(@Nonnull ItemStack stack) { + public String getTranslationKey(@Nonnull ItemStack stack) { if (getHasSubtypes()) { - return String.format("%s.%d", super.getUnlocalizedName(stack), stack.getMetadata()); + return String.format("%s.%d", super.getTranslationKey(stack), stack.getMetadata()); } - return super.getUnlocalizedName(stack); + return super.getTranslationKey(stack); } /** @@ -85,6 +85,6 @@ public boolean addShiftInfo() { @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - return I18n.translateToLocal(getUnlocalizedName(itemstack) + ".name").trim(); + return I18n.translateToLocal(getTranslationKey(itemstack) + ".name").trim(); } } diff --git a/common/logisticspipes/items/LogisticsItemCard.java b/src/main/java/logisticspipes/items/LogisticsItemCard.java similarity index 95% rename from common/logisticspipes/items/LogisticsItemCard.java rename to src/main/java/logisticspipes/items/LogisticsItemCard.java index 7248a47394..8e8f24c825 100644 --- a/common/logisticspipes/items/LogisticsItemCard.java +++ b/src/main/java/logisticspipes/items/LogisticsItemCard.java @@ -6,6 +6,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import logisticspipes.utils.FastUUID; + import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -46,7 +48,7 @@ public void addInformation(@Nonnull ItemStack stack, @Nullable World worldIn, Li if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { tooltip.add("Id: " + tag.getString("UUID")); if (stack.getItemDamage() == LogisticsItemCard.SEC_CARD) { - UUID id = UUID.fromString(tag.getString("UUID")); + UUID id = FastUUID.parseUUID(tag.getString("UUID")); tooltip.add("Authorization: " + (SimpleServiceLocator.securityStationManager.isAuthorized(id) ? "Authorized" : "Unauthorized")); } } diff --git a/common/logisticspipes/items/LogisticsSolidBlockItem.java b/src/main/java/logisticspipes/items/LogisticsSolidBlockItem.java similarity index 92% rename from common/logisticspipes/items/LogisticsSolidBlockItem.java rename to src/main/java/logisticspipes/items/LogisticsSolidBlockItem.java index ed45cef3c8..1af99fec87 100644 --- a/common/logisticspipes/items/LogisticsSolidBlockItem.java +++ b/src/main/java/logisticspipes/items/LogisticsSolidBlockItem.java @@ -28,7 +28,7 @@ public LogisticsSolidBlockItem(LogisticsSolidBlock block) { @Nonnull @Override public String getItemStackDisplayName(@Nonnull ItemStack itemstack) { - return I18n.translateToLocal(getUnlocalizedName(itemstack) + ".name"); + return I18n.translateToLocal(getTranslationKey(itemstack) + ".name"); } } diff --git a/common/logisticspipes/items/RemoteOrderer.java b/src/main/java/logisticspipes/items/RemoteOrderer.java similarity index 100% rename from common/logisticspipes/items/RemoteOrderer.java rename to src/main/java/logisticspipes/items/RemoteOrderer.java diff --git a/common/logisticspipes/logic/BaseLogicConnection.java b/src/main/java/logisticspipes/logic/BaseLogicConnection.java similarity index 100% rename from common/logisticspipes/logic/BaseLogicConnection.java rename to src/main/java/logisticspipes/logic/BaseLogicConnection.java diff --git a/common/logisticspipes/logic/BaseLogicTask.java b/src/main/java/logisticspipes/logic/BaseLogicTask.java similarity index 91% rename from common/logisticspipes/logic/BaseLogicTask.java rename to src/main/java/logisticspipes/logic/BaseLogicTask.java index 88aec96e0e..073491e50f 100644 --- a/common/logisticspipes/logic/BaseLogicTask.java +++ b/src/main/java/logisticspipes/logic/BaseLogicTask.java @@ -2,6 +2,8 @@ import java.util.UUID; +import logisticspipes.utils.FastUUID; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -28,7 +30,7 @@ public BaseLogicTask(NBTTagCompound nbt) { posY = nbt.getInteger("posY"); name = nbt.getString("name"); comment = nbt.getString("comment"); - uuid = UUID.fromString(nbt.getString("uuid")); + uuid = FastUUID.parseUUID(nbt.getString("uuid")); } public BaseLogicTask(int posX, int posY) { @@ -48,7 +50,7 @@ protected void addToNBT(NBTTagCompound nbt) { nbt.setInteger("posY", posY); nbt.setString("name", name); nbt.setString("comment", comment); - nbt.setString("uuid", uuid.toString()); + nbt.setString("uuid", FastUUID.toString(uuid)); } public abstract int getAmountOfInput(); diff --git a/common/logisticspipes/logic/LogicController.java b/src/main/java/logisticspipes/logic/LogicController.java similarity index 100% rename from common/logisticspipes/logic/LogicController.java rename to src/main/java/logisticspipes/logic/LogicController.java diff --git a/common/logisticspipes/logic/LogicParameterType.java b/src/main/java/logisticspipes/logic/LogicParameterType.java similarity index 100% rename from common/logisticspipes/logic/LogicParameterType.java rename to src/main/java/logisticspipes/logic/LogicParameterType.java diff --git a/common/logisticspipes/logic/gui/LogicLayoutGui.java b/src/main/java/logisticspipes/logic/gui/LogicLayoutGui.java similarity index 100% rename from common/logisticspipes/logic/gui/LogicLayoutGui.java rename to src/main/java/logisticspipes/logic/gui/LogicLayoutGui.java diff --git a/common/logisticspipes/logic/interfaces/ILogicControllerTile.java b/src/main/java/logisticspipes/logic/interfaces/ILogicControllerTile.java similarity index 100% rename from common/logisticspipes/logic/interfaces/ILogicControllerTile.java rename to src/main/java/logisticspipes/logic/interfaces/ILogicControllerTile.java diff --git a/common/logisticspipes/logistics/ILogisticsFluidManager.java b/src/main/java/logisticspipes/logistics/ILogisticsFluidManager.java similarity index 100% rename from common/logisticspipes/logistics/ILogisticsFluidManager.java rename to src/main/java/logisticspipes/logistics/ILogisticsFluidManager.java diff --git a/common/logisticspipes/logistics/ILogisticsManager.java b/src/main/java/logisticspipes/logistics/ILogisticsManager.java similarity index 100% rename from common/logisticspipes/logistics/ILogisticsManager.java rename to src/main/java/logisticspipes/logistics/ILogisticsManager.java diff --git a/common/logisticspipes/logistics/LogisticsFluidManager.java b/src/main/java/logisticspipes/logistics/LogisticsFluidManager.java similarity index 100% rename from common/logisticspipes/logistics/LogisticsFluidManager.java rename to src/main/java/logisticspipes/logistics/LogisticsFluidManager.java diff --git a/common/logisticspipes/logistics/LogisticsManager.java b/src/main/java/logisticspipes/logistics/LogisticsManager.java similarity index 100% rename from common/logisticspipes/logistics/LogisticsManager.java rename to src/main/java/logisticspipes/logistics/LogisticsManager.java diff --git a/common/logisticspipes/logisticspipes/ChassisTransportLayer.java b/src/main/java/logisticspipes/logisticspipes/ChassisTransportLayer.java similarity index 100% rename from common/logisticspipes/logisticspipes/ChassisTransportLayer.java rename to src/main/java/logisticspipes/logisticspipes/ChassisTransportLayer.java diff --git a/common/logisticspipes/logisticspipes/IRoutedItem.java b/src/main/java/logisticspipes/logisticspipes/IRoutedItem.java similarity index 100% rename from common/logisticspipes/logisticspipes/IRoutedItem.java rename to src/main/java/logisticspipes/logisticspipes/IRoutedItem.java diff --git a/common/logisticspipes/logisticspipes/ITrackStatistics.java b/src/main/java/logisticspipes/logisticspipes/ITrackStatistics.java similarity index 100% rename from common/logisticspipes/logisticspipes/ITrackStatistics.java rename to src/main/java/logisticspipes/logisticspipes/ITrackStatistics.java diff --git a/common/logisticspipes/logisticspipes/ItemModuleInformationManager.java b/src/main/java/logisticspipes/logisticspipes/ItemModuleInformationManager.java similarity index 100% rename from common/logisticspipes/logisticspipes/ItemModuleInformationManager.java rename to src/main/java/logisticspipes/logisticspipes/ItemModuleInformationManager.java diff --git a/common/logisticspipes/logisticspipes/PipeTransportLayer.java b/src/main/java/logisticspipes/logisticspipes/PipeTransportLayer.java similarity index 100% rename from common/logisticspipes/logisticspipes/PipeTransportLayer.java rename to src/main/java/logisticspipes/logisticspipes/PipeTransportLayer.java diff --git a/common/logisticspipes/logisticspipes/RouteLayer.java b/src/main/java/logisticspipes/logisticspipes/RouteLayer.java similarity index 100% rename from common/logisticspipes/logisticspipes/RouteLayer.java rename to src/main/java/logisticspipes/logisticspipes/RouteLayer.java diff --git a/common/logisticspipes/logisticspipes/TransportLayer.java b/src/main/java/logisticspipes/logisticspipes/TransportLayer.java similarity index 100% rename from common/logisticspipes/logisticspipes/TransportLayer.java rename to src/main/java/logisticspipes/logisticspipes/TransportLayer.java diff --git a/common/logisticspipes/modplugins/jei/AdvancedGuiHandler.java b/src/main/java/logisticspipes/modplugins/jei/AdvancedGuiHandler.java similarity index 100% rename from common/logisticspipes/modplugins/jei/AdvancedGuiHandler.java rename to src/main/java/logisticspipes/modplugins/jei/AdvancedGuiHandler.java diff --git a/common/logisticspipes/modplugins/jei/GhostIngredientHandler.java b/src/main/java/logisticspipes/modplugins/jei/GhostIngredientHandler.java similarity index 100% rename from common/logisticspipes/modplugins/jei/GhostIngredientHandler.java rename to src/main/java/logisticspipes/modplugins/jei/GhostIngredientHandler.java diff --git a/common/logisticspipes/modplugins/jei/JEIPluginLoader.java b/src/main/java/logisticspipes/modplugins/jei/JEIPluginLoader.java similarity index 100% rename from common/logisticspipes/modplugins/jei/JEIPluginLoader.java rename to src/main/java/logisticspipes/modplugins/jei/JEIPluginLoader.java diff --git a/common/logisticspipes/modplugins/jei/RecipeTransferHandler.java b/src/main/java/logisticspipes/modplugins/jei/RecipeTransferHandler.java similarity index 100% rename from common/logisticspipes/modplugins/jei/RecipeTransferHandler.java rename to src/main/java/logisticspipes/modplugins/jei/RecipeTransferHandler.java diff --git a/common/logisticspipes/modplugins/mcmp/LPMCMPAddon.java b/src/main/java/logisticspipes/modplugins/mcmp/LPMCMPAddon.java similarity index 100% rename from common/logisticspipes/modplugins/mcmp/LPMCMPAddon.java rename to src/main/java/logisticspipes/modplugins/mcmp/LPMCMPAddon.java diff --git a/common/logisticspipes/modplugins/mcmp/LPMultipartTile.java b/src/main/java/logisticspipes/modplugins/mcmp/LPMultipartTile.java similarity index 100% rename from common/logisticspipes/modplugins/mcmp/LPMultipartTile.java rename to src/main/java/logisticspipes/modplugins/mcmp/LPMultipartTile.java diff --git a/common/logisticspipes/modplugins/mcmp/LPPipeMultipart.java b/src/main/java/logisticspipes/modplugins/mcmp/LPPipeMultipart.java similarity index 100% rename from common/logisticspipes/modplugins/mcmp/LPPipeMultipart.java rename to src/main/java/logisticspipes/modplugins/mcmp/LPPipeMultipart.java diff --git a/common/logisticspipes/modplugins/nei/DebugHelper.java b/src/main/java/logisticspipes/modplugins/nei/DebugHelper.java similarity index 100% rename from common/logisticspipes/modplugins/nei/DebugHelper.java rename to src/main/java/logisticspipes/modplugins/nei/DebugHelper.java diff --git a/common/logisticspipes/modplugins/nei/DrawHandler.java b/src/main/java/logisticspipes/modplugins/nei/DrawHandler.java similarity index 100% rename from common/logisticspipes/modplugins/nei/DrawHandler.java rename to src/main/java/logisticspipes/modplugins/nei/DrawHandler.java diff --git a/common/logisticspipes/modplugins/nei/LoadingHelper.java b/src/main/java/logisticspipes/modplugins/nei/LoadingHelper.java similarity index 100% rename from common/logisticspipes/modplugins/nei/LoadingHelper.java rename to src/main/java/logisticspipes/modplugins/nei/LoadingHelper.java diff --git a/common/logisticspipes/modplugins/nei/LogisticsCraftingOverlayHandler.java b/src/main/java/logisticspipes/modplugins/nei/LogisticsCraftingOverlayHandler.java similarity index 100% rename from common/logisticspipes/modplugins/nei/LogisticsCraftingOverlayHandler.java rename to src/main/java/logisticspipes/modplugins/nei/LogisticsCraftingOverlayHandler.java diff --git a/common/logisticspipes/modplugins/nei/NEILogisticsPipesConfig.java b/src/main/java/logisticspipes/modplugins/nei/NEILogisticsPipesConfig.java similarity index 100% rename from common/logisticspipes/modplugins/nei/NEILogisticsPipesConfig.java rename to src/main/java/logisticspipes/modplugins/nei/NEILogisticsPipesConfig.java diff --git a/common/logisticspipes/modplugins/nei/NEISolderingStationRecipeManager.java b/src/main/java/logisticspipes/modplugins/nei/NEISolderingStationRecipeManager.java similarity index 100% rename from common/logisticspipes/modplugins/nei/NEISolderingStationRecipeManager.java rename to src/main/java/logisticspipes/modplugins/nei/NEISolderingStationRecipeManager.java diff --git a/common/logisticspipes/modules/ChassisModule.java b/src/main/java/logisticspipes/modules/ChassisModule.java similarity index 62% rename from common/logisticspipes/modules/ChassisModule.java rename to src/main/java/logisticspipes/modules/ChassisModule.java index 1135cb0fca..0e747b9043 100644 --- a/common/logisticspipes/modules/ChassisModule.java +++ b/src/main/java/logisticspipes/modules/ChassisModule.java @@ -8,9 +8,14 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ResourceLocation; +import logisticspipes.logisticspipes.ItemModuleInformationManager; +import logisticspipes.LPItems; +import logisticspipes.items.ItemModule; import logisticspipes.interfaces.IInventoryUtil; import logisticspipes.interfaces.ISlotUpgradeManager; import logisticspipes.network.NewGuiHandler; @@ -20,24 +25,31 @@ import logisticspipes.pipes.PipeLogisticsChassis; import logisticspipes.pipes.PipeLogisticsChassis.ChassiTargetInformation; import logisticspipes.proxy.computers.objects.CCSinkResponder; +import logisticspipes.pipes.upgrades.ModuleUpgradeManager; import logisticspipes.utils.SinkReply; import logisticspipes.utils.item.ItemIdentifier; +import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; +import network.rs485.logisticspipes.connection.SingleAdjacent; import network.rs485.logisticspipes.module.Gui; import network.rs485.logisticspipes.module.PipeServiceProviderUtilKt; -import network.rs485.logisticspipes.property.Property; -import network.rs485.logisticspipes.property.SlottedModule; -import network.rs485.logisticspipes.property.SlottedModuleListProperty; +import network.rs485.logisticspipes.property.*; public class ChassisModule extends LogisticsModule implements Gui { private final PipeLogisticsChassis parentChassis; private final SlottedModuleListProperty modules; + public final InventoryProperty _moduleInventory; + public final ModuleUMListProperty slotUpgradeManagers; + public final AdjacentProperty pointedAdjacent; public ChassisModule(int moduleCount, PipeLogisticsChassis parentChassis) { modules = new SlottedModuleListProperty(moduleCount, "modules"); + _moduleInventory = new InventoryProperty( + new ItemIdentifierInventory(moduleCount, "Chassi pipe", 1), "chassi"); + slotUpgradeManagers = new ModuleUMListProperty(""); + pointedAdjacent = new AdjacentProperty<>(null, parentChassis, "Orientation"); this.parentChassis = parentChassis; - registerPosition(ModulePositionType.IN_PIPE, 0); } @Nonnull @@ -79,6 +91,10 @@ public Stream slottedModules() { return modules.stream(); } + public SingleAdjacent getAdjacent() { + return (SingleAdjacent) this.pointedAdjacent.getValue(); + } + @Override public SinkReply sinksItem(@Nonnull ItemStack stack, ItemIdentifier item, int bestPriority, int bestCustomPriority, boolean allowDefault, boolean includeInTransit, boolean forcePassive) { @@ -133,11 +149,69 @@ public SinkReply sinksItem(@Nonnull ItemStack stack, ItemIdentifier item, int be @Override public void readFromNBT(@Nonnull NBTTagCompound tag) { super.readFromNBT(tag); - // FIXME: remove after 1.12 + for (int i = 0; i < parentChassis.getChassisSize(); i++) { + // TODO: remove after 1.12.2 update, backwards compatibility + final ItemIdentifierStack idStack = this._moduleInventory.getIDStackInSlot(i); + if (idStack != null && !this.hasModule(i)) { + final Item stackItem = idStack.getItem().item; + if (stackItem instanceof ItemModule) { + final ItemModule moduleItem = (ItemModule) stackItem; + LogisticsModule module = moduleItem.getModule(null, parentChassis, parentChassis); + if (module != null) { + this.installModule(i, module); + } + } + } + // remove end + + if (i >= this.slotUpgradeManagers.size()) { + this.addModuleUpgradeManager(); + } + this.slotUpgradeManagers.get(i).readFromNBT(tag, Integer.toString(i)); + } modules.stream() - .filter(slottedModule -> !slottedModule.isEmpty() && tag.hasKey("slot" + slottedModule.getSlot())) - .forEach(slottedModule -> Objects.requireNonNull(slottedModule.getModule()) - .readFromNBT(tag.getCompoundTag("slot" + slottedModule.getSlot()))); + .filter(slottedModule -> !slottedModule.isEmpty()) + .forEach(slottedModule -> { + LogisticsModule logisticsModule = Objects.requireNonNull(slottedModule.getModule()); + // FIXME: rely on getModuleForItem instead + logisticsModule.registerHandler(parentChassis, parentChassis); + slottedModule.registerPosition(); + if (tag.hasKey("slot" + slottedModule.getSlot())) + logisticsModule.readFromNBT(tag.getCompoundTag("slot" + slottedModule.getSlot())); + }); + } + + @Override + public void writeToNBT(@Nonnull NBTTagCompound tag) { + super.writeToNBT(tag); + updateModuleInventory(); + } + + public void addModuleUpgradeManager() { + this.slotUpgradeManagers.add(new ModuleUpgradeManager(parentChassis, parentChassis.getOriginalUpgradeManager())); + } + + // FIXME: remove after 1.12 + public void updateModuleInventory() { + modules.forEach(slottedModule -> { + if (slottedModule.isEmpty()) { + this._moduleInventory.clearInventorySlotContents(slottedModule.getSlot()); + return; + } + final LogisticsModule module = Objects.requireNonNull(slottedModule.getModule()); + final ItemIdentifierStack idStack = this._moduleInventory.getIDStackInSlot(slottedModule.getSlot()); + ItemStack moduleStack; + if (idStack != null) { + moduleStack = idStack.getItem().makeNormalStack(1); + } else { + ResourceLocation resourceLocation = LPItems.modules.get(module.getLPName()); + Item item = Item.REGISTRY.getObject(resourceLocation); + if (item == null) return; + moduleStack = new ItemStack(item); + } + ItemModuleInformationManager.saveInformation(moduleStack, module); + this._moduleInventory.setInventorySlotContents(slottedModule.getSlot(), moduleStack); + }); } @Override diff --git a/common/logisticspipes/modules/LogisticsModule.java b/src/main/java/logisticspipes/modules/LogisticsModule.java similarity index 100% rename from common/logisticspipes/modules/LogisticsModule.java rename to src/main/java/logisticspipes/modules/LogisticsModule.java diff --git a/common/logisticspipes/modules/ModuleActiveSupplier.java b/src/main/java/logisticspipes/modules/ModuleActiveSupplier.java similarity index 100% rename from common/logisticspipes/modules/ModuleActiveSupplier.java rename to src/main/java/logisticspipes/modules/ModuleActiveSupplier.java diff --git a/common/logisticspipes/modules/ModuleCrafter.java b/src/main/java/logisticspipes/modules/ModuleCrafter.java similarity index 99% rename from common/logisticspipes/modules/ModuleCrafter.java rename to src/main/java/logisticspipes/modules/ModuleCrafter.java index 142ed8d992..384907717f 100644 --- a/common/logisticspipes/modules/ModuleCrafter.java +++ b/src/main/java/logisticspipes/modules/ModuleCrafter.java @@ -12,6 +12,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import logisticspipes.utils.*; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; @@ -94,10 +96,6 @@ import logisticspipes.routing.order.IOrderInfoProvider.ResourceType; import logisticspipes.routing.order.LogisticsItemOrder; import logisticspipes.utils.CacheHolder.CacheTypes; -import logisticspipes.utils.DelayedGeneric; -import logisticspipes.utils.FluidIdentifier; -import logisticspipes.utils.PlayerCollectionList; -import logisticspipes.utils.SinkReply; import logisticspipes.utils.SinkReply.BufferMode; import logisticspipes.utils.SinkReply.FixedPriority; import logisticspipes.utils.item.ItemIdentifier; @@ -703,7 +701,7 @@ public void readFromNBT(@Nonnull NBTTagCompound tag) { for (int i = 0; i < 9; i++) { String advancedSatelliteUUIDArrayString = tag.getString("advancedSatelliteUUID" + i); if (!advancedSatelliteUUIDArrayString.isEmpty()) { - advancedSatelliteUUIDList.set(i, UUID.fromString(advancedSatelliteUUIDArrayString)); + advancedSatelliteUUIDList.set(i, FastUUID.parseUUID(advancedSatelliteUUIDArrayString)); } } @@ -711,7 +709,7 @@ public void readFromNBT(@Nonnull NBTTagCompound tag) { for (int i = 0; i < ItemUpgrade.MAX_LIQUID_CRAFTER; i++) { String liquidSatelliteUUIDArrayString = tag.getString("liquidSatelliteUUIDArray" + i); if (!liquidSatelliteUUIDArrayString.isEmpty()) { - liquidSatelliteUUIDList.set(i, UUID.fromString(liquidSatelliteUUIDArrayString)); + liquidSatelliteUUIDList.set(i, FastUUID.parseUUID(liquidSatelliteUUIDArrayString)); } } diff --git a/common/logisticspipes/modules/ModuleCreativeTabBasedItemSink.java b/src/main/java/logisticspipes/modules/ModuleCreativeTabBasedItemSink.java similarity index 100% rename from common/logisticspipes/modules/ModuleCreativeTabBasedItemSink.java rename to src/main/java/logisticspipes/modules/ModuleCreativeTabBasedItemSink.java diff --git a/common/logisticspipes/modules/ModuleEnchantmentSink.java b/src/main/java/logisticspipes/modules/ModuleEnchantmentSink.java similarity index 100% rename from common/logisticspipes/modules/ModuleEnchantmentSink.java rename to src/main/java/logisticspipes/modules/ModuleEnchantmentSink.java diff --git a/common/logisticspipes/modules/ModuleEnchantmentSinkMK2.java b/src/main/java/logisticspipes/modules/ModuleEnchantmentSinkMK2.java similarity index 100% rename from common/logisticspipes/modules/ModuleEnchantmentSinkMK2.java rename to src/main/java/logisticspipes/modules/ModuleEnchantmentSinkMK2.java diff --git a/src/main/java/logisticspipes/modules/ModuleFirewall.java b/src/main/java/logisticspipes/modules/ModuleFirewall.java new file mode 100644 index 0000000000..e1a0303051 --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleFirewall.java @@ -0,0 +1,76 @@ +package logisticspipes.modules; + +import com.google.common.collect.ImmutableList; + +import logisticspipes.utils.item.ItemIdentifierInventory; + +import net.minecraft.nbt.NBTTagCompound; + +import network.rs485.logisticspipes.property.BooleanProperty; +import network.rs485.logisticspipes.property.InventoryProperty; + +import network.rs485.logisticspipes.property.Property; + +import org.jetbrains.annotations.NotNull; + +import java.util.List; + +public class ModuleFirewall extends LogisticsModule { + public final InventoryProperty inv = new InventoryProperty(new ItemIdentifierInventory(6 * 6, "Filter Inv", 1), ""); + public final BooleanProperty blockProvider = new BooleanProperty(false, "blockProvider"); + public final BooleanProperty blockCrafter = new BooleanProperty(false, "blockCrafter"); + public final BooleanProperty blockSorting = new BooleanProperty(false, "blockSorting"); + public final BooleanProperty blockPower = new BooleanProperty(true, "blockPower"); + public final BooleanProperty isBlocking = new BooleanProperty(true, "isBlocking"); + + @NotNull + @Override + public List> getProperties() { + return ImmutableList.>builder() + .add(inv) + .add(blockProvider) + .add(blockCrafter) + .add(blockSorting) + .add(blockPower) + .add(isBlocking) + .build(); + } + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @Override + public void tick() {} + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } + + @Override + public void readFromNBT(@NotNull NBTTagCompound tag) { + super.readFromNBT(tag); + + // FIXME: remove after 1.12 + if (tag.hasKey("blockCrafer")) + blockCrafter.setValue(tag.getBoolean("blockCrafer")); + } +} diff --git a/src/main/java/logisticspipes/modules/ModuleFluidExtractor.java b/src/main/java/logisticspipes/modules/ModuleFluidExtractor.java new file mode 100644 index 0000000000..4a8fd89cdf --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleFluidExtractor.java @@ -0,0 +1,62 @@ +package logisticspipes.modules; + +import java.util.Collections; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.fluids.FluidStack; + +import logisticspipes.interfaces.ITankUtil; +import logisticspipes.pipes.PipeFluidUtil; +import logisticspipes.transport.PipeFluidTransportLogistics; +import logisticspipes.utils.FluidIdentifierStack; +import network.rs485.logisticspipes.property.IntListProperty; +import network.rs485.logisticspipes.property.Property; + +public class ModuleFluidExtractor extends ModuleFluidInsertion { + + private static final int flowRate = 500; + private static final int energyPerFlow = 5; + + public final IntListProperty liquidToExtract = new IntListProperty("liquidToExtract"); + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @NotNull + @Override + public List> getProperties() { + return Collections.singletonList(liquidToExtract); + } + + @Override + public void tick() { + PipeFluidUtil.INSTANCE.getAdjacentTanks(fluidPipe, false) + .forEach(tankData -> extractFrom(tankData.getValue2(), tankData.getValue1().getDirection())); + } + + private void extractFrom(ITankUtil container, EnumFacing side) { + int sideID = side.ordinal(); + FluidStack contained = ((PipeFluidTransportLogistics) fluidPipe.transport).getTankProperties(side)[0].getContents(); + int amountMissing = ((PipeFluidTransportLogistics) fluidPipe.transport).getSideCapacity() - (contained != null ? contained.amount : 0); + if (liquidToExtract.get(sideID) < Math.min(ModuleFluidExtractor.flowRate, amountMissing)) { + if (fluidPipe.useEnergy(ModuleFluidExtractor.energyPerFlow)) { + liquidToExtract.set(sideID, Math.min(ModuleFluidExtractor.flowRate, amountMissing)); + } + } + FluidIdentifierStack extracted = container.drain(Math.min(liquidToExtract.get(sideID), ModuleFluidExtractor.flowRate), false); + + int inserted = 0; + if (extracted != null) { + inserted = ((PipeFluidTransportLogistics) fluidPipe.transport).fill(side, extracted.makeFluidStack(), true); + container.drain(inserted, true); + } + liquidToExtract.increase(sideID, -inserted); + } +} diff --git a/src/main/java/logisticspipes/modules/ModuleFluidInsertion.java b/src/main/java/logisticspipes/modules/ModuleFluidInsertion.java new file mode 100644 index 0000000000..169c8a4b60 --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleFluidInsertion.java @@ -0,0 +1,107 @@ +package logisticspipes.modules; + +import java.util.ArrayList; +import java.util.List; + +import com.google.common.collect.ImmutableList; +import org.jetbrains.annotations.NotNull; + +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.fluids.FluidStack; + +import logisticspipes.logisticspipes.IRoutedItem; +import logisticspipes.pipes.basic.fluid.FluidRoutedPipe; +import logisticspipes.proxy.SimpleServiceLocator; +import logisticspipes.transport.PipeFluidTransportLogistics; +import logisticspipes.utils.FluidIdentifierStack; +import logisticspipes.utils.FluidSinkReply; +import logisticspipes.utils.item.ItemIdentifierStack; +import logisticspipes.utils.tuples.Pair; +import network.rs485.logisticspipes.property.IntListProperty; +import network.rs485.logisticspipes.property.Property; + +public class ModuleFluidInsertion extends LogisticsModule { + + protected final FluidRoutedPipe fluidPipe = (FluidRoutedPipe) _service; + public final IntListProperty nextSendMax = new IntListProperty("nextSendMax"); + public final IntListProperty nextSendMin = new IntListProperty("nextSendMin"); + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @NotNull + @Override + public List> getProperties() { + return ImmutableList.>builder() + .add(nextSendMax) + .add(nextSendMin) + .build(); + } + + @Override + public void tick() { + PipeFluidTransportLogistics transport = (PipeFluidTransportLogistics) fluidPipe.transport; + for (EnumFacing dir : EnumFacing.VALUES) { + FluidStack stack = transport.sideTanks[dir.ordinal()].getFluid(); + if (stack == null) { + continue; + } + stack = stack.copy(); + + if (this.nextSendMax.get(dir.ordinal()) > 0 && stack.amount < transport.sideTanks[dir.ordinal()].getCapacity()) { + this.nextSendMax.increase(dir.ordinal(), -1); + continue; + } + if (nextSendMin.get(dir.ordinal()) > 0) { + this.nextSendMin.increase(dir.ordinal(), -1); + continue; + } + + Pair result = SimpleServiceLocator.logisticsFluidManager.getBestReply(FluidIdentifierStack.getFromStack(stack), fluidPipe.getRouter(), new ArrayList<>()); + if (result == null || result.getValue2().sinkAmount <= 0) { + this.nextSendMax.set(dir.ordinal(), 100); + this.nextSendMin.set(dir.ordinal(), 10); + continue; + } + + if (!fluidPipe.useEnergy((int) (0.01 * result.getValue2().getSinkAmountInt()))) { + this.nextSendMax.set(dir.ordinal(), 100); + this.nextSendMin.set(dir.ordinal(), 10); + continue; + } + + FluidStack toSend = transport.sideTanks[dir.ordinal()].drain(result.getValue2().getSinkAmountInt(), true); + ItemIdentifierStack liquidContainer = SimpleServiceLocator.logisticsFluidManager.getFluidContainer(FluidIdentifierStack.getFromStack(toSend)); + IRoutedItem routed = SimpleServiceLocator.routedItemHelper.createNewTravelItem(liquidContainer); + routed.setDestination(result.getValue1()); + routed.setTransportMode(IRoutedItem.TransportMode.Passive); + fluidPipe.queueRoutedItem(routed, dir); + this.nextSendMax.set(dir.ordinal(), 100); + this.nextSendMin.set(dir.ordinal(), 5); + } + } + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/common/logisticspipes/modules/ModuleFluidSupplier.java b/src/main/java/logisticspipes/modules/ModuleFluidSupplier.java similarity index 67% rename from common/logisticspipes/modules/ModuleFluidSupplier.java rename to src/main/java/logisticspipes/modules/ModuleFluidSupplier.java index 2b901b8330..29792f3fd4 100644 --- a/common/logisticspipes/modules/ModuleFluidSupplier.java +++ b/src/main/java/logisticspipes/modules/ModuleFluidSupplier.java @@ -1,10 +1,10 @@ package logisticspipes.modules; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import java.util.*; import javax.annotation.Nonnull; +import com.google.common.collect.ImmutableList; + import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -16,18 +16,27 @@ import logisticspipes.network.guis.module.inpipe.FluidSupplierSlot; import logisticspipes.pipefxhandlers.Particles; import logisticspipes.pipes.PipeLogisticsChassis.ChassiTargetInformation; +import logisticspipes.pipes.basic.fluid.FluidRoutedPipe; +import logisticspipes.utils.item.ItemIdentifierStack; import logisticspipes.utils.SinkReply; import logisticspipes.utils.SinkReply.FixedPriority; import logisticspipes.utils.item.ItemIdentifier; import logisticspipes.utils.item.ItemIdentifierInventory; + import network.rs485.logisticspipes.module.Gui; +import network.rs485.logisticspipes.property.BooleanProperty; import network.rs485.logisticspipes.property.InventoryProperty; import network.rs485.logisticspipes.property.Property; public class ModuleFluidSupplier extends LogisticsModule implements IClientInformationProvider, Gui { - private final InventoryProperty filterInventory = new InventoryProperty( + protected final FluidRoutedPipe fluidPipe = (FluidRoutedPipe) _service; + + public final HashMap _requestedItems = new HashMap<>(); + + public final InventoryProperty filterInventory = new InventoryProperty( new ItemIdentifierInventory(9, "Requested liquids", 1), ""); + public final BooleanProperty _requestPartials = new BooleanProperty(false, "requestpartials"); private SinkReply _sinkReply; @@ -40,7 +49,10 @@ public String getLPName() { @Nonnull @Override public List> getProperties() { - return Collections.singletonList(filterInventory); + return ImmutableList.>builder() + .add(filterInventory) + .add(_requestPartials) + .build(); } @Nonnull @@ -78,7 +90,35 @@ public SinkReply sinksItem(@Nonnull ItemStack stack, ItemIdentifier item, int be } @Override - public void tick() {} + public void tick() { + + } + + public void decreaseRequested(ItemIdentifierStack item) { + int remaining = item.getStackSize(); + //see if we can get an exact match + Integer count = _requestedItems.get(item.getItem()); + if (count != null) { + _requestedItems.put(item.getItem(), Math.max(0, count - remaining)); + remaining -= count; + } + if (remaining <= 0) { + return; + } + //still remaining... was from fuzzyMatch on a crafter + for (Map.Entry e : _requestedItems.entrySet()) { + if (e.getKey().item == item.getItem().item && e.getKey().itemDamage == item.getItem().itemDamage) { + int expected = e.getValue(); + e.setValue(Math.max(0, expected - remaining)); + remaining -= expected; + } + if (remaining <= 0) { + return; + } + } + //we have no idea what this is, log it. + fluidPipe.debug.log("liquid supplier got unexpected item " + item); + } @Override public @Nonnull diff --git a/src/main/java/logisticspipes/modules/ModuleFluidSupplierMK2.java b/src/main/java/logisticspipes/modules/ModuleFluidSupplierMK2.java new file mode 100644 index 0000000000..345759d66d --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleFluidSupplierMK2.java @@ -0,0 +1,30 @@ +package logisticspipes.modules; + +import java.util.List; + +import com.google.common.collect.ImmutableList; +import org.jetbrains.annotations.NotNull; + +import logisticspipes.pipes.PipeFluidSupplierMk2; +import logisticspipes.utils.item.ItemIdentifierInventory; +import network.rs485.logisticspipes.property.*; + +public class ModuleFluidSupplierMK2 extends ModuleFluidSupplier { + + public final InventoryProperty dummyInventory = new InventoryProperty( + new ItemIdentifierInventory(1, "Fluid to keep stocked", 127, true), ""); + public final IntegerProperty amount = new IntegerProperty(0, "amount"); + public final EnumProperty _bucketMinimum = new EnumProperty<>(PipeFluidSupplierMk2.MinMode.ONEBUCKET, + "_bucketMinimum", PipeFluidSupplierMk2.MinMode.values()); + + @NotNull + @Override + public List> getProperties() { + return ImmutableList.>builder() + .add(dummyInventory) + .add(amount) + .add(_requestPartials) + .add(_bucketMinimum) + .build(); + } +} diff --git a/src/main/java/logisticspipes/modules/ModuleItemInvSysConnect.java b/src/main/java/logisticspipes/modules/ModuleItemInvSysConnect.java new file mode 100644 index 0000000000..8e61712028 --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleItemInvSysConnect.java @@ -0,0 +1,55 @@ +package logisticspipes.modules; + +import java.util.List; + +import com.google.common.collect.ImmutableList; +import org.jetbrains.annotations.NotNull; + +import network.rs485.logisticspipes.property.IntegerProperty; +import network.rs485.logisticspipes.property.Property; +import network.rs485.logisticspipes.property.UUIDProperty; + +public class ModuleItemInvSysConnect extends LogisticsModule { + public final IntegerProperty resistance = new IntegerProperty(0, "resistance"); + public final UUIDProperty connectedChannel = new UUIDProperty(null, "connectedChannel"); + + @NotNull + @Override + public List> getProperties() { + return ImmutableList.>builder() + .add(resistance) + .add(connectedChannel) + .build(); + } + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @Override + public void tick() { + + } + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/common/logisticspipes/modules/ModuleItemSink.java b/src/main/java/logisticspipes/modules/ModuleItemSink.java similarity index 100% rename from common/logisticspipes/modules/ModuleItemSink.java rename to src/main/java/logisticspipes/modules/ModuleItemSink.java diff --git a/src/main/java/logisticspipes/modules/ModuleItemsRequestLogisticsMk2.java b/src/main/java/logisticspipes/modules/ModuleItemsRequestLogisticsMk2.java new file mode 100644 index 0000000000..08ae1d789a --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleItemsRequestLogisticsMk2.java @@ -0,0 +1,51 @@ +package logisticspipes.modules; + +import net.minecraft.item.ItemStack; + +import network.rs485.logisticspipes.property.ItemStackProperty; + +import network.rs485.logisticspipes.property.Property; + +import org.jetbrains.annotations.NotNull; + +import java.util.Collections; +import java.util.List; + +public class ModuleItemsRequestLogisticsMk2 extends LogisticsModule{ + public final ItemStackProperty disk = new ItemStackProperty(ItemStack.EMPTY, "Disk"); + + @NotNull + @Override + public List> getProperties() { + return Collections.singletonList(disk); + } + + @NotNull + @Override + public String getLPName() { + return ""; + } + + @Override + public void tick() {} + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/src/main/java/logisticspipes/modules/ModuleItemsSystemDestinationLogistics.java b/src/main/java/logisticspipes/modules/ModuleItemsSystemDestinationLogistics.java new file mode 100644 index 0000000000..4232c62244 --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleItemsSystemDestinationLogistics.java @@ -0,0 +1,51 @@ +package logisticspipes.modules; + +import java.util.Collections; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import logisticspipes.utils.item.ItemIdentifierInventory; +import network.rs485.logisticspipes.property.InventoryProperty; +import network.rs485.logisticspipes.property.Property; + +public class ModuleItemsSystemDestinationLogistics extends LogisticsModule { + public final InventoryProperty inv = new InventoryProperty(new ItemIdentifierInventory(1, "Freq Slot", 1), ""); + + @NotNull + @Override + public List> getProperties() { + return Collections.singletonList(inv); + } + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @Override + public void tick() { + + } + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/src/main/java/logisticspipes/modules/ModuleItemsSystemEntranceLogistics.java b/src/main/java/logisticspipes/modules/ModuleItemsSystemEntranceLogistics.java new file mode 100644 index 0000000000..00b6a34b7b --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleItemsSystemEntranceLogistics.java @@ -0,0 +1,51 @@ +package logisticspipes.modules; + +import java.util.Collections; +import java.util.List; + +import org.jetbrains.annotations.NotNull; + +import logisticspipes.utils.item.ItemIdentifierInventory; +import network.rs485.logisticspipes.property.InventoryProperty; +import network.rs485.logisticspipes.property.Property; + +public class ModuleItemsSystemEntranceLogistics extends LogisticsModule { + public final InventoryProperty inv = new InventoryProperty(new ItemIdentifierInventory(1, "Freq Slot", 1), ""); + + @NotNull + @Override + public List> getProperties() { + return Collections.singletonList(inv); + } + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @Override + public void tick() { + + } + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/common/logisticspipes/modules/ModuleModBasedItemSink.java b/src/main/java/logisticspipes/modules/ModuleModBasedItemSink.java similarity index 100% rename from common/logisticspipes/modules/ModuleModBasedItemSink.java rename to src/main/java/logisticspipes/modules/ModuleModBasedItemSink.java diff --git a/common/logisticspipes/modules/ModuleOreDictItemSink.java b/src/main/java/logisticspipes/modules/ModuleOreDictItemSink.java similarity index 100% rename from common/logisticspipes/modules/ModuleOreDictItemSink.java rename to src/main/java/logisticspipes/modules/ModuleOreDictItemSink.java diff --git a/common/logisticspipes/modules/ModulePassiveSupplier.java b/src/main/java/logisticspipes/modules/ModulePassiveSupplier.java similarity index 100% rename from common/logisticspipes/modules/ModulePassiveSupplier.java rename to src/main/java/logisticspipes/modules/ModulePassiveSupplier.java diff --git a/common/logisticspipes/modules/ModulePolymorphicItemSink.java b/src/main/java/logisticspipes/modules/ModulePolymorphicItemSink.java similarity index 100% rename from common/logisticspipes/modules/ModulePolymorphicItemSink.java rename to src/main/java/logisticspipes/modules/ModulePolymorphicItemSink.java diff --git a/common/logisticspipes/modules/ModuleProvider.java b/src/main/java/logisticspipes/modules/ModuleProvider.java similarity index 100% rename from common/logisticspipes/modules/ModuleProvider.java rename to src/main/java/logisticspipes/modules/ModuleProvider.java diff --git a/src/main/java/logisticspipes/modules/ModuleRequesterTable.java b/src/main/java/logisticspipes/modules/ModuleRequesterTable.java new file mode 100644 index 0000000000..d068e57c59 --- /dev/null +++ b/src/main/java/logisticspipes/modules/ModuleRequesterTable.java @@ -0,0 +1,66 @@ +package logisticspipes.modules; + +import com.google.common.collect.ImmutableList; + +import network.rs485.logisticspipes.property.Property; + +import org.jetbrains.annotations.NotNull; + +import logisticspipes.utils.item.ItemIdentifierInventory; +import logisticspipes.utils.item.SimpleStackInventory; +import network.rs485.logisticspipes.property.IntegerProperty; +import network.rs485.logisticspipes.property.InventoryProperty; +import network.rs485.logisticspipes.property.SimpleInventoryProperty; + +import java.util.List; + +public class ModuleRequesterTable extends LogisticsModule { + public final SimpleInventoryProperty diskInv = new SimpleInventoryProperty(new SimpleStackInventory(1, "Disk Slot", 1), "diskInv"); + public final SimpleInventoryProperty inv = new SimpleInventoryProperty(new SimpleStackInventory(27, "Crafting Resources", 64), "inv"); + public final InventoryProperty matrix = new InventoryProperty(new ItemIdentifierInventory(9, "Crafting Matrix", 1), "matrix"); + public final SimpleInventoryProperty toSortInv = new SimpleInventoryProperty(new SimpleStackInventory(1, "Sorting Slot", 64), "toSortInv"); + public final IntegerProperty rotation = new IntegerProperty(0, "blockRotation"); + + @NotNull + @Override + public List> getProperties() { + return ImmutableList.>builder() + .add(diskInv) + .add(inv) + .add(matrix) + .add(toSortInv) + .add(rotation) + .build(); + } + + @NotNull + @Override + public String getLPName() { + throw new RuntimeException("Cannot get LP name for " + this); + } + + @Override + public void tick() { + + } + + @Override + public boolean hasGenericInterests() { + return false; + } + + @Override + public boolean interestedInAttachedInventory() { + return false; + } + + @Override + public boolean interestedInUndamagedID() { + return false; + } + + @Override + public boolean receivePassive() { + return false; + } +} diff --git a/common/logisticspipes/modules/ModuleSatellite.java b/src/main/java/logisticspipes/modules/ModuleSatellite.java similarity index 74% rename from common/logisticspipes/modules/ModuleSatellite.java rename to src/main/java/logisticspipes/modules/ModuleSatellite.java index 5c13aa6f57..60c0a8e04f 100644 --- a/common/logisticspipes/modules/ModuleSatellite.java +++ b/src/main/java/logisticspipes/modules/ModuleSatellite.java @@ -1,25 +1,34 @@ package logisticspipes.modules; -import java.util.Collections; import java.util.List; import java.util.Objects; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import logisticspipes.interfaces.IPipeServiceProvider; +import logisticspipes.proxy.MainProxy; import logisticspipes.utils.SinkReply; import logisticspipes.utils.SinkReply.FixedPriority; import logisticspipes.utils.item.ItemIdentifier; import network.rs485.logisticspipes.connection.LPNeighborTileEntityKt; +import network.rs485.logisticspipes.SatellitePipe; +import network.rs485.logisticspipes.property.StringProperty; import network.rs485.logisticspipes.property.Property; public class ModuleSatellite extends LogisticsModule { private final SinkReply _sinkReply = new SinkReply(FixedPriority.ItemSink, 0, true, false, 1, 0, null); + public final StringProperty satellitePipeName = new StringProperty("", "satellitePipeName"); + private final List> properties = ImmutableList.>builder() + .add(satellitePipeName) + .build(); + @Nonnull @Override public String getLPName() { @@ -29,7 +38,7 @@ public String getLPName() { @NotNull @Override public List> getProperties() { - return Collections.emptyList(); + return properties; } @Override @@ -85,4 +94,17 @@ public boolean receivePassive() { return false; } + @Override + public void readFromNBT(@NotNull NBTTagCompound tag) { + super.readFromNBT(tag); + + // FIXME: remove after 1.12 + if (tag.hasKey("satelliteId")) + satellitePipeName.setValue(tag.getString("satelliteId")); + + if (MainProxy.isServer(getWorld()) && _service != null) { + ((SatellitePipe) _service).ensureAllSatelliteStatus(); + } + } + } diff --git a/common/logisticspipes/modules/ModuleTerminus.java b/src/main/java/logisticspipes/modules/ModuleTerminus.java similarity index 100% rename from common/logisticspipes/modules/ModuleTerminus.java rename to src/main/java/logisticspipes/modules/ModuleTerminus.java diff --git a/common/logisticspipes/network/GuiHandler.java b/src/main/java/logisticspipes/network/GuiHandler.java similarity index 95% rename from common/logisticspipes/network/GuiHandler.java rename to src/main/java/logisticspipes/network/GuiHandler.java index 90a3654395..083b635b0b 100644 --- a/common/logisticspipes/network/GuiHandler.java +++ b/src/main/java/logisticspipes/network/GuiHandler.java @@ -137,9 +137,9 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, fina } IInventory inv = null; if (pipe.pipe instanceof PipeItemsSystemEntranceLogistics) { - inv = ((PipeItemsSystemEntranceLogistics) pipe.pipe).inv; + inv = ((PipeItemsSystemEntranceLogistics) pipe.pipe).getModule().inv; } else if (pipe.pipe instanceof PipeItemsSystemDestinationLogistics) { - inv = ((PipeItemsSystemDestinationLogistics) pipe.pipe).inv; + inv = ((PipeItemsSystemDestinationLogistics) pipe.pipe).getModule().inv; } dummy = new DummyContainer(player.inventory, inv); @@ -209,7 +209,7 @@ public void guiClosedByPlayer(EntityPlayer player) { if (pipe == null || !((pipe.pipe instanceof PipeItemsFirewall))) { return null; } - dummy = new DummyContainer(player.inventory, ((PipeItemsFirewall) pipe.pipe).inv); + dummy = new DummyContainer(player.inventory, ((PipeItemsFirewall) pipe.pipe).getModuleFirewall().inv); dummy.addNormalSlotsForPlayerInventory(33, 147); for (int i = 0; i < 6; i++) { for (int j = 0; j < 6; j++) { @@ -222,11 +222,11 @@ public void guiClosedByPlayer(EntityPlayer player) { if (pipe == null || !(pipe.pipe instanceof PipeBlockRequestTable)) { return null; } - dummy = new DummyContainer(player, ((PipeBlockRequestTable) pipe.pipe).matrix, (PipeBlockRequestTable) pipe.pipe); + dummy = new DummyContainer(player, ((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().matrix, (PipeBlockRequestTable) pipe.pipe); int i = 0; for (int Y = 0; Y < 3; Y++) { for (int X = 0; X < 9; X++) { - dummy.addNormalSlot(i++, ((PipeBlockRequestTable) pipe.pipe).inv, 0, 0); + dummy.addNormalSlot(i++, ((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().inv, 0, 0); } } i = 0; @@ -236,8 +236,8 @@ public void guiClosedByPlayer(EntityPlayer player) { } } dummy.addCallableSlotHandler(0, ((PipeBlockRequestTable) pipe.pipe).resultInv, 0, 0, () -> ((PipeBlockRequestTable) fpipe.pipe).getResultForClick()); - dummy.addNormalSlot(0, ((PipeBlockRequestTable) pipe.pipe).toSortInv, 0, 0); - dummy.addNormalSlot(0, ((PipeBlockRequestTable) pipe.pipe).diskInv, 0, 0); + dummy.addNormalSlot(0, ((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().toSortInv, 0, 0); + dummy.addNormalSlot(0, ((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().diskInv, 0, 0); dummy.addNormalSlotsForPlayerInventory(0, 0); return dummy; @@ -302,9 +302,9 @@ public Object getClientGuiElement(int ID, EntityPlayer player, final World world } IInventory inv = null; if (pipe.pipe instanceof PipeItemsSystemEntranceLogistics) { - inv = ((PipeItemsSystemEntranceLogistics) pipe.pipe).inv; + inv = ((PipeItemsSystemEntranceLogistics) pipe.pipe).getModule().inv; } else if (pipe.pipe instanceof PipeItemsSystemDestinationLogistics) { - inv = ((PipeItemsSystemDestinationLogistics) pipe.pipe).inv; + inv = ((PipeItemsSystemDestinationLogistics) pipe.pipe).getModule().inv; } return new GuiFreqCardContent(player, inv); diff --git a/common/logisticspipes/network/GuiIDs.java b/src/main/java/logisticspipes/network/GuiIDs.java similarity index 100% rename from common/logisticspipes/network/GuiIDs.java rename to src/main/java/logisticspipes/network/GuiIDs.java diff --git a/common/logisticspipes/network/IReadListObject.java b/src/main/java/logisticspipes/network/IReadListObject.java similarity index 100% rename from common/logisticspipes/network/IReadListObject.java rename to src/main/java/logisticspipes/network/IReadListObject.java diff --git a/common/logisticspipes/network/IWriteListObject.java b/src/main/java/logisticspipes/network/IWriteListObject.java similarity index 100% rename from common/logisticspipes/network/IWriteListObject.java rename to src/main/java/logisticspipes/network/IWriteListObject.java diff --git a/common/logisticspipes/network/NewGuiHandler.java b/src/main/java/logisticspipes/network/NewGuiHandler.java similarity index 100% rename from common/logisticspipes/network/NewGuiHandler.java rename to src/main/java/logisticspipes/network/NewGuiHandler.java diff --git a/common/logisticspipes/network/PacketHandler.java b/src/main/java/logisticspipes/network/PacketHandler.java similarity index 100% rename from common/logisticspipes/network/PacketHandler.java rename to src/main/java/logisticspipes/network/PacketHandler.java diff --git a/common/logisticspipes/network/PacketInboundHandler.java b/src/main/java/logisticspipes/network/PacketInboundHandler.java similarity index 100% rename from common/logisticspipes/network/PacketInboundHandler.java rename to src/main/java/logisticspipes/network/PacketInboundHandler.java diff --git a/common/logisticspipes/network/abstractguis/BooleanModuleCoordinatesGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/BooleanModuleCoordinatesGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/BooleanModuleCoordinatesGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/BooleanModuleCoordinatesGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/CoordinatesGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/CoordinatesGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/CoordinatesGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/CoordinatesGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/CoordinatesPopupGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/CoordinatesPopupGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/CoordinatesPopupGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/CoordinatesPopupGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/GuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/GuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/GuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/GuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/ModuleCoordinatesGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/ModuleCoordinatesGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/ModuleCoordinatesGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/ModuleCoordinatesGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/ModuleInHandGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/ModuleInHandGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/ModuleInHandGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/ModuleInHandGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/NBTModuleCoordinatesGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/NBTModuleCoordinatesGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/NBTModuleCoordinatesGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/NBTModuleCoordinatesGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/PopupGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/PopupGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/PopupGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/PopupGuiProvider.java diff --git a/common/logisticspipes/network/abstractguis/UpgradeCoordinatesGuiProvider.java b/src/main/java/logisticspipes/network/abstractguis/UpgradeCoordinatesGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractguis/UpgradeCoordinatesGuiProvider.java rename to src/main/java/logisticspipes/network/abstractguis/UpgradeCoordinatesGuiProvider.java diff --git a/common/logisticspipes/network/abstractpackets/BitSetCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/BitSetCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/BitSetCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/BitSetCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/BooleanCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/BooleanCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/BooleanCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/BooleanCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/BooleanModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/BooleanModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/BooleanModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/BooleanModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/ChannelInformationListCoordinatesPopupGuiProvider.java b/src/main/java/logisticspipes/network/abstractpackets/ChannelInformationListCoordinatesPopupGuiProvider.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/ChannelInformationListCoordinatesPopupGuiProvider.java rename to src/main/java/logisticspipes/network/abstractpackets/ChannelInformationListCoordinatesPopupGuiProvider.java diff --git a/common/logisticspipes/network/abstractpackets/CoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/CoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/CoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/CoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/DirectionModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/DirectionModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/DirectionModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/DirectionModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/GuiPacket.java b/src/main/java/logisticspipes/network/abstractpackets/GuiPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/GuiPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/GuiPacket.java diff --git a/common/logisticspipes/network/abstractpackets/Integer2CoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/Integer2CoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/Integer2CoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/Integer2CoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/Integer2ModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/Integer2ModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/Integer2ModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/Integer2ModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/IntegerCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/IntegerCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/IntegerCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/IntegerCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/IntegerModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/IntegerModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/IntegerModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/IntegerModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/IntegerPacket.java b/src/main/java/logisticspipes/network/abstractpackets/IntegerPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/IntegerPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/IntegerPacket.java diff --git a/common/logisticspipes/network/abstractpackets/InventoryModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/InventoryModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/InventoryModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/InventoryModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/ItemPacket.java b/src/main/java/logisticspipes/network/abstractpackets/ItemPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/ItemPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/ItemPacket.java diff --git a/common/logisticspipes/network/abstractpackets/ListSyncPacket.java b/src/main/java/logisticspipes/network/abstractpackets/ListSyncPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/ListSyncPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/ListSyncPacket.java diff --git a/common/logisticspipes/network/abstractpackets/ModernPacket.java b/src/main/java/logisticspipes/network/abstractpackets/ModernPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/ModernPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/ModernPacket.java diff --git a/common/logisticspipes/network/abstractpackets/ModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/ModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/ModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/ModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/NBTCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/NBTCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/NBTCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/NBTCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/NBTModuleCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/NBTModuleCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/NBTModuleCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/NBTModuleCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/RequestPacket.java b/src/main/java/logisticspipes/network/abstractpackets/RequestPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/RequestPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/RequestPacket.java diff --git a/common/logisticspipes/network/abstractpackets/SlotPacket.java b/src/main/java/logisticspipes/network/abstractpackets/SlotPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/SlotPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/SlotPacket.java diff --git a/common/logisticspipes/network/abstractpackets/StringCoordinatesPacket.java b/src/main/java/logisticspipes/network/abstractpackets/StringCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/StringCoordinatesPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/StringCoordinatesPacket.java diff --git a/common/logisticspipes/network/abstractpackets/StringListPacket.java b/src/main/java/logisticspipes/network/abstractpackets/StringListPacket.java similarity index 100% rename from common/logisticspipes/network/abstractpackets/StringListPacket.java rename to src/main/java/logisticspipes/network/abstractpackets/StringListPacket.java diff --git a/common/logisticspipes/network/exception/DelayPacketException.java b/src/main/java/logisticspipes/network/exception/DelayPacketException.java similarity index 100% rename from common/logisticspipes/network/exception/DelayPacketException.java rename to src/main/java/logisticspipes/network/exception/DelayPacketException.java diff --git a/common/logisticspipes/network/exception/TargetNotFoundException.java b/src/main/java/logisticspipes/network/exception/TargetNotFoundException.java similarity index 100% rename from common/logisticspipes/network/exception/TargetNotFoundException.java rename to src/main/java/logisticspipes/network/exception/TargetNotFoundException.java diff --git a/common/logisticspipes/network/guis/AddChannelGuiProvider.java b/src/main/java/logisticspipes/network/guis/AddChannelGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/AddChannelGuiProvider.java rename to src/main/java/logisticspipes/network/guis/AddChannelGuiProvider.java diff --git a/common/logisticspipes/network/guis/EditChannelGuiProvider.java b/src/main/java/logisticspipes/network/guis/EditChannelGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/EditChannelGuiProvider.java rename to src/main/java/logisticspipes/network/guis/EditChannelGuiProvider.java diff --git a/common/logisticspipes/network/guis/LogisticsPlayerSettingsGuiProvider.java b/src/main/java/logisticspipes/network/guis/LogisticsPlayerSettingsGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/LogisticsPlayerSettingsGuiProvider.java rename to src/main/java/logisticspipes/network/guis/LogisticsPlayerSettingsGuiProvider.java diff --git a/common/logisticspipes/network/guis/OpenGuideBook.java b/src/main/java/logisticspipes/network/guis/OpenGuideBook.java similarity index 100% rename from common/logisticspipes/network/guis/OpenGuideBook.java rename to src/main/java/logisticspipes/network/guis/OpenGuideBook.java diff --git a/common/logisticspipes/network/guis/block/AutoCraftingGui.java b/src/main/java/logisticspipes/network/guis/block/AutoCraftingGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/AutoCraftingGui.java rename to src/main/java/logisticspipes/network/guis/block/AutoCraftingGui.java diff --git a/common/logisticspipes/network/guis/block/PowerJunctionGui.java b/src/main/java/logisticspipes/network/guis/block/PowerJunctionGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/PowerJunctionGui.java rename to src/main/java/logisticspipes/network/guis/block/PowerJunctionGui.java diff --git a/common/logisticspipes/network/guis/block/PowerProviderGui.java b/src/main/java/logisticspipes/network/guis/block/PowerProviderGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/PowerProviderGui.java rename to src/main/java/logisticspipes/network/guis/block/PowerProviderGui.java diff --git a/common/logisticspipes/network/guis/block/ProgramCompilerGui.java b/src/main/java/logisticspipes/network/guis/block/ProgramCompilerGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/ProgramCompilerGui.java rename to src/main/java/logisticspipes/network/guis/block/ProgramCompilerGui.java diff --git a/common/logisticspipes/network/guis/block/SecurityChannelManagerGui.java b/src/main/java/logisticspipes/network/guis/block/SecurityChannelManagerGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/SecurityChannelManagerGui.java rename to src/main/java/logisticspipes/network/guis/block/SecurityChannelManagerGui.java diff --git a/common/logisticspipes/network/guis/block/SecurityStationGui.java b/src/main/java/logisticspipes/network/guis/block/SecurityStationGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/SecurityStationGui.java rename to src/main/java/logisticspipes/network/guis/block/SecurityStationGui.java diff --git a/common/logisticspipes/network/guis/block/StatisticsGui.java b/src/main/java/logisticspipes/network/guis/block/StatisticsGui.java similarity index 100% rename from common/logisticspipes/network/guis/block/StatisticsGui.java rename to src/main/java/logisticspipes/network/guis/block/StatisticsGui.java diff --git a/common/logisticspipes/network/guis/item/ItemAmountSignGui.java b/src/main/java/logisticspipes/network/guis/item/ItemAmountSignGui.java similarity index 100% rename from common/logisticspipes/network/guis/item/ItemAmountSignGui.java rename to src/main/java/logisticspipes/network/guis/item/ItemAmountSignGui.java diff --git a/common/logisticspipes/network/guis/item/ItemMangerGui.java b/src/main/java/logisticspipes/network/guis/item/ItemMangerGui.java similarity index 100% rename from common/logisticspipes/network/guis/item/ItemMangerGui.java rename to src/main/java/logisticspipes/network/guis/item/ItemMangerGui.java diff --git a/common/logisticspipes/network/guis/logic/LogicControllerGuiProvider.java b/src/main/java/logisticspipes/network/guis/logic/LogicControllerGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/logic/LogicControllerGuiProvider.java rename to src/main/java/logisticspipes/network/guis/logic/LogicControllerGuiProvider.java diff --git a/common/logisticspipes/network/guis/module/inhand/ActiveSupplierInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/ActiveSupplierInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/ActiveSupplierInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/ActiveSupplierInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/AdvancedExtractorModuleInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/AdvancedExtractorModuleInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/AdvancedExtractorModuleInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/AdvancedExtractorModuleInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/CraftingModuleInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/CraftingModuleInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/CraftingModuleInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/CraftingModuleInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/ItemSinkInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/ItemSinkInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/ItemSinkInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/ItemSinkInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/OreDictItemSinkModuleInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/OreDictItemSinkModuleInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/OreDictItemSinkModuleInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/OreDictItemSinkModuleInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/ProviderModuleInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/ProviderModuleInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/ProviderModuleInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/ProviderModuleInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/SimpleFilterInventoryInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/SimpleFilterInventoryInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/SimpleFilterInventoryInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/SimpleFilterInventoryInHand.java diff --git a/common/logisticspipes/network/guis/module/inhand/SneakyModuleInHandGuiProvider.java b/src/main/java/logisticspipes/network/guis/module/inhand/SneakyModuleInHandGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/SneakyModuleInHandGuiProvider.java rename to src/main/java/logisticspipes/network/guis/module/inhand/SneakyModuleInHandGuiProvider.java diff --git a/common/logisticspipes/network/guis/module/inhand/StringBasedItemSinkModuleGuiInHand.java b/src/main/java/logisticspipes/network/guis/module/inhand/StringBasedItemSinkModuleGuiInHand.java similarity index 100% rename from common/logisticspipes/network/guis/module/inhand/StringBasedItemSinkModuleGuiInHand.java rename to src/main/java/logisticspipes/network/guis/module/inhand/StringBasedItemSinkModuleGuiInHand.java diff --git a/common/logisticspipes/network/guis/module/inpipe/ActiveSupplierSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/ActiveSupplierSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/ActiveSupplierSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/ActiveSupplierSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/AdvancedExtractorModuleSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/AdvancedExtractorModuleSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/AdvancedExtractorModuleSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/AdvancedExtractorModuleSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/CraftingModuleSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/CraftingModuleSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/CraftingModuleSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/CraftingModuleSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/FluidSupplierSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/FluidSupplierSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/FluidSupplierSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/FluidSupplierSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/ItemSinkSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/ItemSinkSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/ItemSinkSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/ItemSinkSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/OreDictItemSinkModuleSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/OreDictItemSinkModuleSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/OreDictItemSinkModuleSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/OreDictItemSinkModuleSlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/ProviderModuleGuiProvider.java b/src/main/java/logisticspipes/network/guis/module/inpipe/ProviderModuleGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/ProviderModuleGuiProvider.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/ProviderModuleGuiProvider.java diff --git a/common/logisticspipes/network/guis/module/inpipe/SimpleFilterInventorySlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/SimpleFilterInventorySlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/SimpleFilterInventorySlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/SimpleFilterInventorySlot.java diff --git a/common/logisticspipes/network/guis/module/inpipe/SneakyModuleInSlotGuiProvider.java b/src/main/java/logisticspipes/network/guis/module/inpipe/SneakyModuleInSlotGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/SneakyModuleInSlotGuiProvider.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/SneakyModuleInSlotGuiProvider.java diff --git a/common/logisticspipes/network/guis/module/inpipe/StringBasedItemSinkModuleGuiSlot.java b/src/main/java/logisticspipes/network/guis/module/inpipe/StringBasedItemSinkModuleGuiSlot.java similarity index 100% rename from common/logisticspipes/network/guis/module/inpipe/StringBasedItemSinkModuleGuiSlot.java rename to src/main/java/logisticspipes/network/guis/module/inpipe/StringBasedItemSinkModuleGuiSlot.java diff --git a/common/logisticspipes/network/guis/pipe/ChassisGuiProvider.java b/src/main/java/logisticspipes/network/guis/pipe/ChassisGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/pipe/ChassisGuiProvider.java rename to src/main/java/logisticspipes/network/guis/pipe/ChassisGuiProvider.java diff --git a/common/logisticspipes/network/guis/pipe/InvSysConGuiProvider.java b/src/main/java/logisticspipes/network/guis/pipe/InvSysConGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/pipe/InvSysConGuiProvider.java rename to src/main/java/logisticspipes/network/guis/pipe/InvSysConGuiProvider.java diff --git a/common/logisticspipes/network/guis/pipe/InvSysConSelectChannelPopupGUIProvider.java b/src/main/java/logisticspipes/network/guis/pipe/InvSysConSelectChannelPopupGUIProvider.java similarity index 100% rename from common/logisticspipes/network/guis/pipe/InvSysConSelectChannelPopupGUIProvider.java rename to src/main/java/logisticspipes/network/guis/pipe/InvSysConSelectChannelPopupGUIProvider.java diff --git a/common/logisticspipes/network/guis/pipe/PipeController.java b/src/main/java/logisticspipes/network/guis/pipe/PipeController.java similarity index 97% rename from common/logisticspipes/network/guis/pipe/PipeController.java rename to src/main/java/logisticspipes/network/guis/pipe/PipeController.java index 91c574bf43..ac976082bb 100644 --- a/common/logisticspipes/network/guis/pipe/PipeController.java +++ b/src/main/java/logisticspipes/network/guis/pipe/PipeController.java @@ -1,7 +1,8 @@ package logisticspipes.network.guis.pipe; import java.util.Objects; -import java.util.UUID; + +import logisticspipes.utils.FastUUID; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -88,7 +89,7 @@ public void guiClosedByPlayer(EntityPlayer player) { return false; } final NBTTagCompound tag = Objects.requireNonNull(itemStack.getTagCompound()); - return SimpleServiceLocator.securityStationManager.isAuthorized(UUID.fromString(tag.getString("UUID"))); + return SimpleServiceLocator.securityStationManager.isAuthorized(FastUUID.parseUUID(tag.getString("UUID"))); }, 1); dummy.addRestrictedSlot(0, tile.logicController.diskInv, 14, 36, LPItems.disk); return dummy; diff --git a/common/logisticspipes/network/guis/upgrade/DisconnectionUpgradeConfigGuiProvider.java b/src/main/java/logisticspipes/network/guis/upgrade/DisconnectionUpgradeConfigGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/upgrade/DisconnectionUpgradeConfigGuiProvider.java rename to src/main/java/logisticspipes/network/guis/upgrade/DisconnectionUpgradeConfigGuiProvider.java diff --git a/common/logisticspipes/network/guis/upgrade/SneakyUpgradeConfigGuiProvider.java b/src/main/java/logisticspipes/network/guis/upgrade/SneakyUpgradeConfigGuiProvider.java similarity index 100% rename from common/logisticspipes/network/guis/upgrade/SneakyUpgradeConfigGuiProvider.java rename to src/main/java/logisticspipes/network/guis/upgrade/SneakyUpgradeConfigGuiProvider.java diff --git a/common/logisticspipes/network/packetcontent/IPacketContent.java b/src/main/java/logisticspipes/network/packetcontent/IPacketContent.java similarity index 100% rename from common/logisticspipes/network/packetcontent/IPacketContent.java rename to src/main/java/logisticspipes/network/packetcontent/IPacketContent.java diff --git a/common/logisticspipes/network/packetcontent/IntegerContent.java b/src/main/java/logisticspipes/network/packetcontent/IntegerContent.java similarity index 100% rename from common/logisticspipes/network/packetcontent/IntegerContent.java rename to src/main/java/logisticspipes/network/packetcontent/IntegerContent.java diff --git a/common/logisticspipes/network/packetcontent/ItemStackContent.java b/src/main/java/logisticspipes/network/packetcontent/ItemStackContent.java similarity index 100% rename from common/logisticspipes/network/packetcontent/ItemStackContent.java rename to src/main/java/logisticspipes/network/packetcontent/ItemStackContent.java diff --git a/common/logisticspipes/network/packetcontent/PacketContentBuilder.java b/src/main/java/logisticspipes/network/packetcontent/PacketContentBuilder.java similarity index 100% rename from common/logisticspipes/network/packetcontent/PacketContentBuilder.java rename to src/main/java/logisticspipes/network/packetcontent/PacketContentBuilder.java diff --git a/common/logisticspipes/network/packets/ActivateNBTDebug.java b/src/main/java/logisticspipes/network/packets/ActivateNBTDebug.java similarity index 100% rename from common/logisticspipes/network/packets/ActivateNBTDebug.java rename to src/main/java/logisticspipes/network/packets/ActivateNBTDebug.java diff --git a/common/logisticspipes/network/packets/AddNewChannelPacket.java b/src/main/java/logisticspipes/network/packets/AddNewChannelPacket.java similarity index 100% rename from common/logisticspipes/network/packets/AddNewChannelPacket.java rename to src/main/java/logisticspipes/network/packets/AddNewChannelPacket.java diff --git a/common/logisticspipes/network/packets/BufferTransfer.java b/src/main/java/logisticspipes/network/packets/BufferTransfer.java similarity index 100% rename from common/logisticspipes/network/packets/BufferTransfer.java rename to src/main/java/logisticspipes/network/packets/BufferTransfer.java diff --git a/common/logisticspipes/network/packets/DeleteChannelPacket.java b/src/main/java/logisticspipes/network/packets/DeleteChannelPacket.java similarity index 100% rename from common/logisticspipes/network/packets/DeleteChannelPacket.java rename to src/main/java/logisticspipes/network/packets/DeleteChannelPacket.java diff --git a/common/logisticspipes/network/packets/DummyPacket.java b/src/main/java/logisticspipes/network/packets/DummyPacket.java similarity index 100% rename from common/logisticspipes/network/packets/DummyPacket.java rename to src/main/java/logisticspipes/network/packets/DummyPacket.java diff --git a/common/logisticspipes/network/packets/EditChannelPacket.java b/src/main/java/logisticspipes/network/packets/EditChannelPacket.java similarity index 100% rename from common/logisticspipes/network/packets/EditChannelPacket.java rename to src/main/java/logisticspipes/network/packets/EditChannelPacket.java diff --git a/common/logisticspipes/network/packets/NEISetCraftingRecipe.java b/src/main/java/logisticspipes/network/packets/NEISetCraftingRecipe.java similarity index 100% rename from common/logisticspipes/network/packets/NEISetCraftingRecipe.java rename to src/main/java/logisticspipes/network/packets/NEISetCraftingRecipe.java diff --git a/common/logisticspipes/network/packets/PlayerConfigToClientPacket.java b/src/main/java/logisticspipes/network/packets/PlayerConfigToClientPacket.java similarity index 100% rename from common/logisticspipes/network/packets/PlayerConfigToClientPacket.java rename to src/main/java/logisticspipes/network/packets/PlayerConfigToClientPacket.java diff --git a/common/logisticspipes/network/packets/PlayerConfigToServerPacket.java b/src/main/java/logisticspipes/network/packets/PlayerConfigToServerPacket.java similarity index 100% rename from common/logisticspipes/network/packets/PlayerConfigToServerPacket.java rename to src/main/java/logisticspipes/network/packets/PlayerConfigToServerPacket.java diff --git a/common/logisticspipes/network/packets/PlayerList.java b/src/main/java/logisticspipes/network/packets/PlayerList.java similarity index 100% rename from common/logisticspipes/network/packets/PlayerList.java rename to src/main/java/logisticspipes/network/packets/PlayerList.java diff --git a/common/logisticspipes/network/packets/PlayerListRequest.java b/src/main/java/logisticspipes/network/packets/PlayerListRequest.java similarity index 100% rename from common/logisticspipes/network/packets/PlayerListRequest.java rename to src/main/java/logisticspipes/network/packets/PlayerListRequest.java diff --git a/common/logisticspipes/network/packets/RequestUpdateNamesPacket.java b/src/main/java/logisticspipes/network/packets/RequestUpdateNamesPacket.java similarity index 100% rename from common/logisticspipes/network/packets/RequestUpdateNamesPacket.java rename to src/main/java/logisticspipes/network/packets/RequestUpdateNamesPacket.java diff --git a/common/logisticspipes/network/packets/SetGhostItemPacket.java b/src/main/java/logisticspipes/network/packets/SetGhostItemPacket.java similarity index 100% rename from common/logisticspipes/network/packets/SetGhostItemPacket.java rename to src/main/java/logisticspipes/network/packets/SetGhostItemPacket.java diff --git a/common/logisticspipes/network/packets/UpdateName.java b/src/main/java/logisticspipes/network/packets/UpdateName.java similarity index 100% rename from common/logisticspipes/network/packets/UpdateName.java rename to src/main/java/logisticspipes/network/packets/UpdateName.java diff --git a/common/logisticspipes/network/packets/block/AddItemToTrackPacket.java b/src/main/java/logisticspipes/network/packets/block/AddItemToTrackPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/AddItemToTrackPacket.java rename to src/main/java/logisticspipes/network/packets/block/AddItemToTrackPacket.java diff --git a/common/logisticspipes/network/packets/block/AmountTaskSubGui.java b/src/main/java/logisticspipes/network/packets/block/AmountTaskSubGui.java similarity index 100% rename from common/logisticspipes/network/packets/block/AmountTaskSubGui.java rename to src/main/java/logisticspipes/network/packets/block/AmountTaskSubGui.java diff --git a/common/logisticspipes/network/packets/block/ClearCraftingGridPacket.java b/src/main/java/logisticspipes/network/packets/block/ClearCraftingGridPacket.java similarity index 95% rename from common/logisticspipes/network/packets/block/ClearCraftingGridPacket.java rename to src/main/java/logisticspipes/network/packets/block/ClearCraftingGridPacket.java index 63e6bc9ae9..563b7837ed 100644 --- a/common/logisticspipes/network/packets/block/ClearCraftingGridPacket.java +++ b/src/main/java/logisticspipes/network/packets/block/ClearCraftingGridPacket.java @@ -22,7 +22,7 @@ public void processPacket(EntityPlayer player) { TileEntity table = this.getTileAs(player.getEntityWorld(), TileEntity.class); if (table instanceof LogisticsCraftingTableTileEntity) { } else if (table instanceof LogisticsTileGenericPipe && ((LogisticsTileGenericPipe) table).pipe instanceof PipeBlockRequestTable) { - ((PipeBlockRequestTable) ((LogisticsTileGenericPipe) table).pipe).matrix.clearGrid(); + ((PipeBlockRequestTable) ((LogisticsTileGenericPipe) table).pipe).getModuleRequesterTable().matrix.clearGrid(); ((PipeBlockRequestTable) ((LogisticsTileGenericPipe) table).pipe).cacheRecipe(); } } diff --git a/common/logisticspipes/network/packets/block/CompilerStatusPacket.java b/src/main/java/logisticspipes/network/packets/block/CompilerStatusPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/CompilerStatusPacket.java rename to src/main/java/logisticspipes/network/packets/block/CompilerStatusPacket.java diff --git a/common/logisticspipes/network/packets/block/CompilerTriggerTaskPacket.java b/src/main/java/logisticspipes/network/packets/block/CompilerTriggerTaskPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/CompilerTriggerTaskPacket.java rename to src/main/java/logisticspipes/network/packets/block/CompilerTriggerTaskPacket.java diff --git a/common/logisticspipes/network/packets/block/CraftingCycleRecipe.java b/src/main/java/logisticspipes/network/packets/block/CraftingCycleRecipe.java similarity index 100% rename from common/logisticspipes/network/packets/block/CraftingCycleRecipe.java rename to src/main/java/logisticspipes/network/packets/block/CraftingCycleRecipe.java diff --git a/common/logisticspipes/network/packets/block/CraftingSetType.java b/src/main/java/logisticspipes/network/packets/block/CraftingSetType.java similarity index 100% rename from common/logisticspipes/network/packets/block/CraftingSetType.java rename to src/main/java/logisticspipes/network/packets/block/CraftingSetType.java diff --git a/common/logisticspipes/network/packets/block/LogicControllerPacket.java b/src/main/java/logisticspipes/network/packets/block/LogicControllerPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/LogicControllerPacket.java rename to src/main/java/logisticspipes/network/packets/block/LogicControllerPacket.java diff --git a/common/logisticspipes/network/packets/block/PipeSolidSideCheck.java b/src/main/java/logisticspipes/network/packets/block/PipeSolidSideCheck.java similarity index 100% rename from common/logisticspipes/network/packets/block/PipeSolidSideCheck.java rename to src/main/java/logisticspipes/network/packets/block/PipeSolidSideCheck.java diff --git a/common/logisticspipes/network/packets/block/PowerJunctionCheatPacket.java b/src/main/java/logisticspipes/network/packets/block/PowerJunctionCheatPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/PowerJunctionCheatPacket.java rename to src/main/java/logisticspipes/network/packets/block/PowerJunctionCheatPacket.java diff --git a/common/logisticspipes/network/packets/block/PowerJunctionLevel.java b/src/main/java/logisticspipes/network/packets/block/PowerJunctionLevel.java similarity index 100% rename from common/logisticspipes/network/packets/block/PowerJunctionLevel.java rename to src/main/java/logisticspipes/network/packets/block/PowerJunctionLevel.java diff --git a/common/logisticspipes/network/packets/block/PowerPacketLaser.java b/src/main/java/logisticspipes/network/packets/block/PowerPacketLaser.java similarity index 100% rename from common/logisticspipes/network/packets/block/PowerPacketLaser.java rename to src/main/java/logisticspipes/network/packets/block/PowerPacketLaser.java diff --git a/common/logisticspipes/network/packets/block/PowerProviderLevel.java b/src/main/java/logisticspipes/network/packets/block/PowerProviderLevel.java similarity index 100% rename from common/logisticspipes/network/packets/block/PowerProviderLevel.java rename to src/main/java/logisticspipes/network/packets/block/PowerProviderLevel.java diff --git a/common/logisticspipes/network/packets/block/RemoveAmoundTask.java b/src/main/java/logisticspipes/network/packets/block/RemoveAmoundTask.java similarity index 100% rename from common/logisticspipes/network/packets/block/RemoveAmoundTask.java rename to src/main/java/logisticspipes/network/packets/block/RemoveAmoundTask.java diff --git a/common/logisticspipes/network/packets/block/RequestAmountTaskSubGui.java b/src/main/java/logisticspipes/network/packets/block/RequestAmountTaskSubGui.java similarity index 100% rename from common/logisticspipes/network/packets/block/RequestAmountTaskSubGui.java rename to src/main/java/logisticspipes/network/packets/block/RequestAmountTaskSubGui.java diff --git a/common/logisticspipes/network/packets/block/RequestRotationPacket.java b/src/main/java/logisticspipes/network/packets/block/RequestRotationPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/RequestRotationPacket.java rename to src/main/java/logisticspipes/network/packets/block/RequestRotationPacket.java diff --git a/common/logisticspipes/network/packets/block/RequestRunningCraftingTasks.java b/src/main/java/logisticspipes/network/packets/block/RequestRunningCraftingTasks.java similarity index 100% rename from common/logisticspipes/network/packets/block/RequestRunningCraftingTasks.java rename to src/main/java/logisticspipes/network/packets/block/RequestRunningCraftingTasks.java diff --git a/common/logisticspipes/network/packets/block/Rotation.java b/src/main/java/logisticspipes/network/packets/block/Rotation.java similarity index 100% rename from common/logisticspipes/network/packets/block/Rotation.java rename to src/main/java/logisticspipes/network/packets/block/Rotation.java diff --git a/common/logisticspipes/network/packets/block/RunningCraftingTasks.java b/src/main/java/logisticspipes/network/packets/block/RunningCraftingTasks.java similarity index 100% rename from common/logisticspipes/network/packets/block/RunningCraftingTasks.java rename to src/main/java/logisticspipes/network/packets/block/RunningCraftingTasks.java diff --git a/common/logisticspipes/network/packets/block/SaveSecurityPlayerPacket.java b/src/main/java/logisticspipes/network/packets/block/SaveSecurityPlayerPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SaveSecurityPlayerPacket.java rename to src/main/java/logisticspipes/network/packets/block/SaveSecurityPlayerPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityAddCCIdPacket.java b/src/main/java/logisticspipes/network/packets/block/SecurityAddCCIdPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityAddCCIdPacket.java rename to src/main/java/logisticspipes/network/packets/block/SecurityAddCCIdPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityAuthorizationPacket.java b/src/main/java/logisticspipes/network/packets/block/SecurityAuthorizationPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityAuthorizationPacket.java rename to src/main/java/logisticspipes/network/packets/block/SecurityAuthorizationPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityCardPacket.java b/src/main/java/logisticspipes/network/packets/block/SecurityCardPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityCardPacket.java rename to src/main/java/logisticspipes/network/packets/block/SecurityCardPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityRemoveCCIdPacket.java b/src/main/java/logisticspipes/network/packets/block/SecurityRemoveCCIdPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityRemoveCCIdPacket.java rename to src/main/java/logisticspipes/network/packets/block/SecurityRemoveCCIdPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityRequestCCIdsPacket.java b/src/main/java/logisticspipes/network/packets/block/SecurityRequestCCIdsPacket.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityRequestCCIdsPacket.java rename to src/main/java/logisticspipes/network/packets/block/SecurityRequestCCIdsPacket.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationAuthorizedList.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationAuthorizedList.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationAuthorizedList.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationAuthorizedList.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationAutoDestroy.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationAutoDestroy.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationAutoDestroy.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationAutoDestroy.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationCC.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationCC.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationCC.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationCC.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationCCIDs.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationCCIDs.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationCCIDs.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationCCIDs.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationId.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationId.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationId.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationId.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationOpenPlayer.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationOpenPlayer.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationOpenPlayer.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationOpenPlayer.java diff --git a/common/logisticspipes/network/packets/block/SecurityStationOpenPlayerRequest.java b/src/main/java/logisticspipes/network/packets/block/SecurityStationOpenPlayerRequest.java similarity index 100% rename from common/logisticspipes/network/packets/block/SecurityStationOpenPlayerRequest.java rename to src/main/java/logisticspipes/network/packets/block/SecurityStationOpenPlayerRequest.java diff --git a/common/logisticspipes/network/packets/chassis/ChassisGUI.java b/src/main/java/logisticspipes/network/packets/chassis/ChassisGUI.java similarity index 100% rename from common/logisticspipes/network/packets/chassis/ChassisGUI.java rename to src/main/java/logisticspipes/network/packets/chassis/ChassisGUI.java diff --git a/common/logisticspipes/network/packets/chassis/ChestGuiClosed.java b/src/main/java/logisticspipes/network/packets/chassis/ChestGuiClosed.java similarity index 100% rename from common/logisticspipes/network/packets/chassis/ChestGuiClosed.java rename to src/main/java/logisticspipes/network/packets/chassis/ChestGuiClosed.java diff --git a/common/logisticspipes/network/packets/chassis/ChestGuiOpened.java b/src/main/java/logisticspipes/network/packets/chassis/ChestGuiOpened.java similarity index 100% rename from common/logisticspipes/network/packets/chassis/ChestGuiOpened.java rename to src/main/java/logisticspipes/network/packets/chassis/ChestGuiOpened.java diff --git a/common/logisticspipes/network/packets/chassis/EnableQuickSortMarker.java b/src/main/java/logisticspipes/network/packets/chassis/EnableQuickSortMarker.java similarity index 100% rename from common/logisticspipes/network/packets/chassis/EnableQuickSortMarker.java rename to src/main/java/logisticspipes/network/packets/chassis/EnableQuickSortMarker.java diff --git a/common/logisticspipes/network/packets/cpipe/CPipeCleanupImport.java b/src/main/java/logisticspipes/network/packets/cpipe/CPipeCleanupImport.java similarity index 100% rename from common/logisticspipes/network/packets/cpipe/CPipeCleanupImport.java rename to src/main/java/logisticspipes/network/packets/cpipe/CPipeCleanupImport.java diff --git a/common/logisticspipes/network/packets/cpipe/CPipeSatelliteImport.java b/src/main/java/logisticspipes/network/packets/cpipe/CPipeSatelliteImport.java similarity index 100% rename from common/logisticspipes/network/packets/cpipe/CPipeSatelliteImport.java rename to src/main/java/logisticspipes/network/packets/cpipe/CPipeSatelliteImport.java diff --git a/common/logisticspipes/network/packets/cpipe/CPipeSatelliteImportBack.java b/src/main/java/logisticspipes/network/packets/cpipe/CPipeSatelliteImportBack.java similarity index 100% rename from common/logisticspipes/network/packets/cpipe/CPipeSatelliteImportBack.java rename to src/main/java/logisticspipes/network/packets/cpipe/CPipeSatelliteImportBack.java diff --git a/common/logisticspipes/network/packets/cpipe/CraftingPipeOpenConnectedGuiPacket.java b/src/main/java/logisticspipes/network/packets/cpipe/CraftingPipeOpenConnectedGuiPacket.java similarity index 100% rename from common/logisticspipes/network/packets/cpipe/CraftingPipeOpenConnectedGuiPacket.java rename to src/main/java/logisticspipes/network/packets/cpipe/CraftingPipeOpenConnectedGuiPacket.java diff --git a/common/logisticspipes/network/packets/debug/PipeDebugLogAskForTarget.java b/src/main/java/logisticspipes/network/packets/debug/PipeDebugLogAskForTarget.java similarity index 100% rename from common/logisticspipes/network/packets/debug/PipeDebugLogAskForTarget.java rename to src/main/java/logisticspipes/network/packets/debug/PipeDebugLogAskForTarget.java diff --git a/common/logisticspipes/network/packets/debug/PipeDebugLogResponse.java b/src/main/java/logisticspipes/network/packets/debug/PipeDebugLogResponse.java similarity index 100% rename from common/logisticspipes/network/packets/debug/PipeDebugLogResponse.java rename to src/main/java/logisticspipes/network/packets/debug/PipeDebugLogResponse.java diff --git a/common/logisticspipes/network/packets/debug/SendNewLogLine.java b/src/main/java/logisticspipes/network/packets/debug/SendNewLogLine.java similarity index 100% rename from common/logisticspipes/network/packets/debug/SendNewLogLine.java rename to src/main/java/logisticspipes/network/packets/debug/SendNewLogLine.java diff --git a/common/logisticspipes/network/packets/debug/SendNewLogWindow.java b/src/main/java/logisticspipes/network/packets/debug/SendNewLogWindow.java similarity index 100% rename from common/logisticspipes/network/packets/debug/SendNewLogWindow.java rename to src/main/java/logisticspipes/network/packets/debug/SendNewLogWindow.java diff --git a/common/logisticspipes/network/packets/debug/UpdateStatusEntries.java b/src/main/java/logisticspipes/network/packets/debug/UpdateStatusEntries.java similarity index 100% rename from common/logisticspipes/network/packets/debug/UpdateStatusEntries.java rename to src/main/java/logisticspipes/network/packets/debug/UpdateStatusEntries.java diff --git a/common/logisticspipes/network/packets/debuggui/DebugAskForTarget.java b/src/main/java/logisticspipes/network/packets/debuggui/DebugAskForTarget.java similarity index 100% rename from common/logisticspipes/network/packets/debuggui/DebugAskForTarget.java rename to src/main/java/logisticspipes/network/packets/debuggui/DebugAskForTarget.java diff --git a/common/logisticspipes/network/packets/debuggui/DebugDataPacket.java b/src/main/java/logisticspipes/network/packets/debuggui/DebugDataPacket.java similarity index 100% rename from common/logisticspipes/network/packets/debuggui/DebugDataPacket.java rename to src/main/java/logisticspipes/network/packets/debuggui/DebugDataPacket.java diff --git a/common/logisticspipes/network/packets/debuggui/DebugPanelOpen.java b/src/main/java/logisticspipes/network/packets/debuggui/DebugPanelOpen.java similarity index 100% rename from common/logisticspipes/network/packets/debuggui/DebugPanelOpen.java rename to src/main/java/logisticspipes/network/packets/debuggui/DebugPanelOpen.java diff --git a/common/logisticspipes/network/packets/debuggui/DebugTargetResponse.java b/src/main/java/logisticspipes/network/packets/debuggui/DebugTargetResponse.java similarity index 100% rename from common/logisticspipes/network/packets/debuggui/DebugTargetResponse.java rename to src/main/java/logisticspipes/network/packets/debuggui/DebugTargetResponse.java diff --git a/common/logisticspipes/network/packets/gui/ChannelInformationPacket.java b/src/main/java/logisticspipes/network/packets/gui/ChannelInformationPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/ChannelInformationPacket.java rename to src/main/java/logisticspipes/network/packets/gui/ChannelInformationPacket.java diff --git a/common/logisticspipes/network/packets/gui/DummyContainerSlotClick.java b/src/main/java/logisticspipes/network/packets/gui/DummyContainerSlotClick.java similarity index 100% rename from common/logisticspipes/network/packets/gui/DummyContainerSlotClick.java rename to src/main/java/logisticspipes/network/packets/gui/DummyContainerSlotClick.java diff --git a/common/logisticspipes/network/packets/gui/FuzzySlotSettingsPacket.java b/src/main/java/logisticspipes/network/packets/gui/FuzzySlotSettingsPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/FuzzySlotSettingsPacket.java rename to src/main/java/logisticspipes/network/packets/gui/FuzzySlotSettingsPacket.java diff --git a/common/logisticspipes/network/packets/gui/GuiClosePacket.java b/src/main/java/logisticspipes/network/packets/gui/GuiClosePacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/GuiClosePacket.java rename to src/main/java/logisticspipes/network/packets/gui/GuiClosePacket.java diff --git a/common/logisticspipes/network/packets/gui/GuiOpenChassis.java b/src/main/java/logisticspipes/network/packets/gui/GuiOpenChassis.java similarity index 100% rename from common/logisticspipes/network/packets/gui/GuiOpenChassis.java rename to src/main/java/logisticspipes/network/packets/gui/GuiOpenChassis.java diff --git a/common/logisticspipes/network/packets/gui/GuiReopenPacket.java b/src/main/java/logisticspipes/network/packets/gui/GuiReopenPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/GuiReopenPacket.java rename to src/main/java/logisticspipes/network/packets/gui/GuiReopenPacket.java diff --git a/common/logisticspipes/network/packets/gui/OpenAddChannelGUIPacket.java b/src/main/java/logisticspipes/network/packets/gui/OpenAddChannelGUIPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenAddChannelGUIPacket.java rename to src/main/java/logisticspipes/network/packets/gui/OpenAddChannelGUIPacket.java diff --git a/common/logisticspipes/network/packets/gui/OpenChatGui.java b/src/main/java/logisticspipes/network/packets/gui/OpenChatGui.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenChatGui.java rename to src/main/java/logisticspipes/network/packets/gui/OpenChatGui.java diff --git a/common/logisticspipes/network/packets/gui/OpenEditChannelGUIPacket.java b/src/main/java/logisticspipes/network/packets/gui/OpenEditChannelGUIPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenEditChannelGUIPacket.java rename to src/main/java/logisticspipes/network/packets/gui/OpenEditChannelGUIPacket.java diff --git a/common/logisticspipes/network/packets/gui/OpenGUIPacket.java b/src/main/java/logisticspipes/network/packets/gui/OpenGUIPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenGUIPacket.java rename to src/main/java/logisticspipes/network/packets/gui/OpenGUIPacket.java diff --git a/common/logisticspipes/network/packets/gui/OpenSecurityChannelManagerPacket.java b/src/main/java/logisticspipes/network/packets/gui/OpenSecurityChannelManagerPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenSecurityChannelManagerPacket.java rename to src/main/java/logisticspipes/network/packets/gui/OpenSecurityChannelManagerPacket.java diff --git a/common/logisticspipes/network/packets/gui/OpenUpgradePacket.java b/src/main/java/logisticspipes/network/packets/gui/OpenUpgradePacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/OpenUpgradePacket.java rename to src/main/java/logisticspipes/network/packets/gui/OpenUpgradePacket.java diff --git a/common/logisticspipes/network/packets/gui/ProvideSatellitePipeListPacket.java b/src/main/java/logisticspipes/network/packets/gui/ProvideSatellitePipeListPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/ProvideSatellitePipeListPacket.java rename to src/main/java/logisticspipes/network/packets/gui/ProvideSatellitePipeListPacket.java diff --git a/common/logisticspipes/network/packets/gui/RequestSatellitePipeListPacket.java b/src/main/java/logisticspipes/network/packets/gui/RequestSatellitePipeListPacket.java similarity index 100% rename from common/logisticspipes/network/packets/gui/RequestSatellitePipeListPacket.java rename to src/main/java/logisticspipes/network/packets/gui/RequestSatellitePipeListPacket.java diff --git a/common/logisticspipes/network/packets/hud/ChestContent.java b/src/main/java/logisticspipes/network/packets/hud/ChestContent.java similarity index 100% rename from common/logisticspipes/network/packets/hud/ChestContent.java rename to src/main/java/logisticspipes/network/packets/hud/ChestContent.java diff --git a/common/logisticspipes/network/packets/hud/HUDSettingsPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDSettingsPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDSettingsPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDSettingsPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStartBlockWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStartBlockWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStartBlockWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStartBlockWatchingPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStartModuleWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStartModuleWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStartModuleWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStartModuleWatchingPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStartWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStartWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStartWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStartWatchingPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStopBlockWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStopBlockWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStopBlockWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStopBlockWatchingPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStopModuleWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStopModuleWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStopModuleWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStopModuleWatchingPacket.java diff --git a/common/logisticspipes/network/packets/hud/HUDStopWatchingPacket.java b/src/main/java/logisticspipes/network/packets/hud/HUDStopWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/hud/HUDStopWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/hud/HUDStopWatchingPacket.java diff --git a/common/logisticspipes/network/packets/module/AdvancedExtractorSneakyGuiPacket.java b/src/main/java/logisticspipes/network/packets/module/AdvancedExtractorSneakyGuiPacket.java similarity index 100% rename from common/logisticspipes/network/packets/module/AdvancedExtractorSneakyGuiPacket.java rename to src/main/java/logisticspipes/network/packets/module/AdvancedExtractorSneakyGuiPacket.java diff --git a/common/logisticspipes/network/packets/module/ItemSinkImportPacket.java b/src/main/java/logisticspipes/network/packets/module/ItemSinkImportPacket.java similarity index 100% rename from common/logisticspipes/network/packets/module/ItemSinkImportPacket.java rename to src/main/java/logisticspipes/network/packets/module/ItemSinkImportPacket.java diff --git a/common/logisticspipes/network/packets/module/ModuleBasedItemSinkList.java b/src/main/java/logisticspipes/network/packets/module/ModuleBasedItemSinkList.java similarity index 100% rename from common/logisticspipes/network/packets/module/ModuleBasedItemSinkList.java rename to src/main/java/logisticspipes/network/packets/module/ModuleBasedItemSinkList.java diff --git a/common/logisticspipes/network/packets/module/ModuleInventory.java b/src/main/java/logisticspipes/network/packets/module/ModuleInventory.java similarity index 100% rename from common/logisticspipes/network/packets/module/ModuleInventory.java rename to src/main/java/logisticspipes/network/packets/module/ModuleInventory.java diff --git a/common/logisticspipes/network/packets/module/ModulePropertiesUpdate.java b/src/main/java/logisticspipes/network/packets/module/ModulePropertiesUpdate.java similarity index 100% rename from common/logisticspipes/network/packets/module/ModulePropertiesUpdate.java rename to src/main/java/logisticspipes/network/packets/module/ModulePropertiesUpdate.java diff --git a/common/logisticspipes/network/packets/module/OreDictItemSinkList.java b/src/main/java/logisticspipes/network/packets/module/OreDictItemSinkList.java similarity index 100% rename from common/logisticspipes/network/packets/module/OreDictItemSinkList.java rename to src/main/java/logisticspipes/network/packets/module/OreDictItemSinkList.java diff --git a/common/logisticspipes/network/packets/modules/AdvancedExtractorInclude.java b/src/main/java/logisticspipes/network/packets/modules/AdvancedExtractorInclude.java similarity index 100% rename from common/logisticspipes/network/packets/modules/AdvancedExtractorInclude.java rename to src/main/java/logisticspipes/network/packets/modules/AdvancedExtractorInclude.java diff --git a/common/logisticspipes/network/packets/modules/ItemSinkDefault.java b/src/main/java/logisticspipes/network/packets/modules/ItemSinkDefault.java similarity index 100% rename from common/logisticspipes/network/packets/modules/ItemSinkDefault.java rename to src/main/java/logisticspipes/network/packets/modules/ItemSinkDefault.java diff --git a/common/logisticspipes/network/packets/modules/ProviderModuleInclude.java b/src/main/java/logisticspipes/network/packets/modules/ProviderModuleInclude.java similarity index 100% rename from common/logisticspipes/network/packets/modules/ProviderModuleInclude.java rename to src/main/java/logisticspipes/network/packets/modules/ProviderModuleInclude.java diff --git a/common/logisticspipes/network/packets/modules/ProviderModuleMode.java b/src/main/java/logisticspipes/network/packets/modules/ProviderModuleMode.java similarity index 100% rename from common/logisticspipes/network/packets/modules/ProviderModuleMode.java rename to src/main/java/logisticspipes/network/packets/modules/ProviderModuleMode.java diff --git a/common/logisticspipes/network/packets/modules/QuickSortState.java b/src/main/java/logisticspipes/network/packets/modules/QuickSortState.java similarity index 100% rename from common/logisticspipes/network/packets/modules/QuickSortState.java rename to src/main/java/logisticspipes/network/packets/modules/QuickSortState.java diff --git a/common/logisticspipes/network/packets/modules/SneakyModuleDirectionUpdate.java b/src/main/java/logisticspipes/network/packets/modules/SneakyModuleDirectionUpdate.java similarity index 100% rename from common/logisticspipes/network/packets/modules/SneakyModuleDirectionUpdate.java rename to src/main/java/logisticspipes/network/packets/modules/SneakyModuleDirectionUpdate.java diff --git a/common/logisticspipes/network/packets/modules/SupplierPipeMode.java b/src/main/java/logisticspipes/network/packets/modules/SupplierPipeMode.java similarity index 100% rename from common/logisticspipes/network/packets/modules/SupplierPipeMode.java rename to src/main/java/logisticspipes/network/packets/modules/SupplierPipeMode.java diff --git a/common/logisticspipes/network/packets/multiblock/MultiBlockCoordinatesPacket.java b/src/main/java/logisticspipes/network/packets/multiblock/MultiBlockCoordinatesPacket.java similarity index 100% rename from common/logisticspipes/network/packets/multiblock/MultiBlockCoordinatesPacket.java rename to src/main/java/logisticspipes/network/packets/multiblock/MultiBlockCoordinatesPacket.java diff --git a/common/logisticspipes/network/packets/orderer/ComponentList.java b/src/main/java/logisticspipes/network/packets/orderer/ComponentList.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/ComponentList.java rename to src/main/java/logisticspipes/network/packets/orderer/ComponentList.java diff --git a/common/logisticspipes/network/packets/orderer/DiscContent.java b/src/main/java/logisticspipes/network/packets/orderer/DiscContent.java similarity index 76% rename from common/logisticspipes/network/packets/orderer/DiscContent.java rename to src/main/java/logisticspipes/network/packets/orderer/DiscContent.java index 60edd8db30..e29c6f5ffd 100644 --- a/common/logisticspipes/network/packets/orderer/DiscContent.java +++ b/src/main/java/logisticspipes/network/packets/orderer/DiscContent.java @@ -42,13 +42,13 @@ public void processPacket(EntityPlayer player) { } if (tile.pipe instanceof PipeBlockRequestTable) { if (MainProxy.isServer(tile.getWorld())) { - if (!((PipeBlockRequestTable) tile.pipe).diskInv.getStackInSlot(0).isEmpty() && ((PipeBlockRequestTable) tile.pipe).diskInv.getStackInSlot(0).getItem().equals(LPItems.disk)) { + if (!((PipeBlockRequestTable) tile.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).isEmpty() && ((PipeBlockRequestTable) tile.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).getItem().equals(LPItems.disk)) { if (!getStack().isEmpty() && getStack().getItem().equals(LPItems.disk)) { - ((PipeBlockRequestTable) tile.pipe).diskInv.getStackInSlot(0).setTagCompound(getStack().getTagCompound()); + ((PipeBlockRequestTable) tile.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).setTagCompound(getStack().getTagCompound()); } } } else { - ((PipeBlockRequestTable) tile.pipe).diskInv.setInventorySlotContents(0, getStack()); + ((PipeBlockRequestTable) tile.pipe).getModuleRequesterTable().diskInv.setInventorySlotContents(0, getStack()); } } } diff --git a/common/logisticspipes/network/packets/orderer/DiskDropPacket.java b/src/main/java/logisticspipes/network/packets/orderer/DiskDropPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/DiskDropPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/DiskDropPacket.java diff --git a/common/logisticspipes/network/packets/orderer/DiskMacroRequestPacket.java b/src/main/java/logisticspipes/network/packets/orderer/DiskMacroRequestPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/DiskMacroRequestPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/DiskMacroRequestPacket.java diff --git a/common/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java b/src/main/java/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java similarity index 58% rename from common/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java index 47434fa958..00739c46e3 100644 --- a/common/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java +++ b/src/main/java/logisticspipes/network/packets/orderer/DiskRequestConectPacket.java @@ -32,24 +32,24 @@ public void processPacket(EntityPlayer player) { return; } if (pipe.pipe instanceof PipeItemsRequestLogisticsMk2) { - if (((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk() != null) { - if (((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().getItem().equals(LPItems.disk)) { - if (!((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().hasTagCompound()) { - ((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().setTagCompound(new NBTTagCompound()); - } + if (((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().getItem().equals(LPItems.disk)) { + if (!((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().hasTagCompound()) { + ((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk().setTagCompound(new NBTTagCompound()); } } - MainProxy.sendPacketToPlayer(PacketHandler.getPacket(DiscContent.class).setStack(((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk()).setBlockPos(pipe.getPos()), player); + MainProxy.sendPacketToPlayer(PacketHandler.getPacket(DiscContent.class).setStack(((PipeItemsRequestLogisticsMk2) pipe.pipe).getDisk()) + .setBlockPos(pipe.getPos()), player); } if (pipe.pipe instanceof PipeBlockRequestTable) { - if (((PipeBlockRequestTable) pipe.pipe).diskInv.getStackInSlot(0) != null) { - if (((PipeBlockRequestTable) pipe.pipe).diskInv.getStackInSlot(0).getItem().equals(LPItems.disk)) { - if (!((PipeBlockRequestTable) pipe.pipe).diskInv.getStackInSlot(0).hasTagCompound()) { - ((PipeBlockRequestTable) pipe.pipe).diskInv.getStackInSlot(0).setTagCompound(new NBTTagCompound()); + if (((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0) != null) { + if (((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).getItem().equals(LPItems.disk)) { + if (!((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).hasTagCompound()) { + ((PipeBlockRequestTable) pipe.pipe).getModuleRequesterTable().diskInv.getStackInSlot(0).setTagCompound(new NBTTagCompound()); } } } - MainProxy.sendPacketToPlayer(PacketHandler.getPacket(DiscContent.class).setStack(((PipeBlockRequestTable) pipe.pipe).diskInv.getStackInSlot(0)).setBlockPos(pipe.getPos()), player); + MainProxy.sendPacketToPlayer(PacketHandler.getPacket(DiscContent.class).setStack(((PipeBlockRequestTable) pipe.pipe) + .getModuleRequesterTable().diskInv.getStackInSlot(0)).setBlockPos(pipe.getPos()), player); } } } diff --git a/common/logisticspipes/network/packets/orderer/DiskSetNamePacket.java b/src/main/java/logisticspipes/network/packets/orderer/DiskSetNamePacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/DiskSetNamePacket.java rename to src/main/java/logisticspipes/network/packets/orderer/DiskSetNamePacket.java diff --git a/common/logisticspipes/network/packets/orderer/MissingItems.java b/src/main/java/logisticspipes/network/packets/orderer/MissingItems.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/MissingItems.java rename to src/main/java/logisticspipes/network/packets/orderer/MissingItems.java diff --git a/common/logisticspipes/network/packets/orderer/OrderWatchRemovePacket.java b/src/main/java/logisticspipes/network/packets/orderer/OrderWatchRemovePacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/OrderWatchRemovePacket.java rename to src/main/java/logisticspipes/network/packets/orderer/OrderWatchRemovePacket.java diff --git a/common/logisticspipes/network/packets/orderer/OrdererContent.java b/src/main/java/logisticspipes/network/packets/orderer/OrdererContent.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/OrdererContent.java rename to src/main/java/logisticspipes/network/packets/orderer/OrdererContent.java diff --git a/common/logisticspipes/network/packets/orderer/OrdererManagerContent.java b/src/main/java/logisticspipes/network/packets/orderer/OrdererManagerContent.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/OrdererManagerContent.java rename to src/main/java/logisticspipes/network/packets/orderer/OrdererManagerContent.java diff --git a/common/logisticspipes/network/packets/orderer/OrdererRefreshRequestPacket.java b/src/main/java/logisticspipes/network/packets/orderer/OrdererRefreshRequestPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/OrdererRefreshRequestPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/OrdererRefreshRequestPacket.java diff --git a/common/logisticspipes/network/packets/orderer/OrdererWatchPacket.java b/src/main/java/logisticspipes/network/packets/orderer/OrdererWatchPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/OrdererWatchPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/OrdererWatchPacket.java diff --git a/common/logisticspipes/network/packets/orderer/RequestComponentPacket.java b/src/main/java/logisticspipes/network/packets/orderer/RequestComponentPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/RequestComponentPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/RequestComponentPacket.java diff --git a/common/logisticspipes/network/packets/orderer/RequestFluidOrdererRefreshPacket.java b/src/main/java/logisticspipes/network/packets/orderer/RequestFluidOrdererRefreshPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/RequestFluidOrdererRefreshPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/RequestFluidOrdererRefreshPacket.java diff --git a/common/logisticspipes/network/packets/orderer/RequestSubmitListPacket.java b/src/main/java/logisticspipes/network/packets/orderer/RequestSubmitListPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/RequestSubmitListPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/RequestSubmitListPacket.java diff --git a/common/logisticspipes/network/packets/orderer/RequestSubmitPacket.java b/src/main/java/logisticspipes/network/packets/orderer/RequestSubmitPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/RequestSubmitPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/RequestSubmitPacket.java diff --git a/common/logisticspipes/network/packets/orderer/SubmitFluidRequestPacket.java b/src/main/java/logisticspipes/network/packets/orderer/SubmitFluidRequestPacket.java similarity index 100% rename from common/logisticspipes/network/packets/orderer/SubmitFluidRequestPacket.java rename to src/main/java/logisticspipes/network/packets/orderer/SubmitFluidRequestPacket.java diff --git a/common/logisticspipes/network/packets/pipe/AskForOpenTarget.java b/src/main/java/logisticspipes/network/packets/pipe/AskForOpenTarget.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/AskForOpenTarget.java rename to src/main/java/logisticspipes/network/packets/pipe/AskForOpenTarget.java diff --git a/common/logisticspipes/network/packets/pipe/ChassisOrientationPacket.java b/src/main/java/logisticspipes/network/packets/pipe/ChassisOrientationPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/ChassisOrientationPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/ChassisOrientationPacket.java diff --git a/common/logisticspipes/network/packets/pipe/ChassisPipeModuleContent.java b/src/main/java/logisticspipes/network/packets/pipe/ChassisPipeModuleContent.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/ChassisPipeModuleContent.java rename to src/main/java/logisticspipes/network/packets/pipe/ChassisPipeModuleContent.java diff --git a/common/logisticspipes/network/packets/pipe/CraftingPipeSetSatellitePacket.java b/src/main/java/logisticspipes/network/packets/pipe/CraftingPipeSetSatellitePacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/CraftingPipeSetSatellitePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/CraftingPipeSetSatellitePacket.java diff --git a/common/logisticspipes/network/packets/pipe/CraftingPipeUpdatePacket.java b/src/main/java/logisticspipes/network/packets/pipe/CraftingPipeUpdatePacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/CraftingPipeUpdatePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/CraftingPipeUpdatePacket.java diff --git a/common/logisticspipes/network/packets/pipe/CraftingPriority.java b/src/main/java/logisticspipes/network/packets/pipe/CraftingPriority.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/CraftingPriority.java rename to src/main/java/logisticspipes/network/packets/pipe/CraftingPriority.java diff --git a/common/logisticspipes/network/packets/pipe/FindMostLikelyRecipeComponents.java b/src/main/java/logisticspipes/network/packets/pipe/FindMostLikelyRecipeComponents.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FindMostLikelyRecipeComponents.java rename to src/main/java/logisticspipes/network/packets/pipe/FindMostLikelyRecipeComponents.java diff --git a/common/logisticspipes/network/packets/pipe/FireWallFlag.java b/src/main/java/logisticspipes/network/packets/pipe/FireWallFlag.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FireWallFlag.java rename to src/main/java/logisticspipes/network/packets/pipe/FireWallFlag.java diff --git a/common/logisticspipes/network/packets/pipe/FluidCraftingAmount.java b/src/main/java/logisticspipes/network/packets/pipe/FluidCraftingAmount.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FluidCraftingAmount.java rename to src/main/java/logisticspipes/network/packets/pipe/FluidCraftingAmount.java diff --git a/common/logisticspipes/network/packets/pipe/FluidSupplierAmount.java b/src/main/java/logisticspipes/network/packets/pipe/FluidSupplierAmount.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FluidSupplierAmount.java rename to src/main/java/logisticspipes/network/packets/pipe/FluidSupplierAmount.java diff --git a/common/logisticspipes/network/packets/pipe/FluidSupplierMinMode.java b/src/main/java/logisticspipes/network/packets/pipe/FluidSupplierMinMode.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FluidSupplierMinMode.java rename to src/main/java/logisticspipes/network/packets/pipe/FluidSupplierMinMode.java diff --git a/common/logisticspipes/network/packets/pipe/FluidSupplierMode.java b/src/main/java/logisticspipes/network/packets/pipe/FluidSupplierMode.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/FluidSupplierMode.java rename to src/main/java/logisticspipes/network/packets/pipe/FluidSupplierMode.java diff --git a/common/logisticspipes/network/packets/pipe/InvSysConContent.java b/src/main/java/logisticspipes/network/packets/pipe/InvSysConContent.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/InvSysConContent.java rename to src/main/java/logisticspipes/network/packets/pipe/InvSysConContent.java diff --git a/common/logisticspipes/network/packets/pipe/InvSysConContentRequest.java b/src/main/java/logisticspipes/network/packets/pipe/InvSysConContentRequest.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/InvSysConContentRequest.java rename to src/main/java/logisticspipes/network/packets/pipe/InvSysConContentRequest.java diff --git a/common/logisticspipes/network/packets/pipe/InvSysConOpenSelectChannelPopupPacket.java b/src/main/java/logisticspipes/network/packets/pipe/InvSysConOpenSelectChannelPopupPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/InvSysConOpenSelectChannelPopupPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/InvSysConOpenSelectChannelPopupPacket.java diff --git a/common/logisticspipes/network/packets/pipe/InvSysConResistance.java b/src/main/java/logisticspipes/network/packets/pipe/InvSysConResistance.java similarity index 89% rename from common/logisticspipes/network/packets/pipe/InvSysConResistance.java rename to src/main/java/logisticspipes/network/packets/pipe/InvSysConResistance.java index 85303de8ea..04f180d09b 100644 --- a/common/logisticspipes/network/packets/pipe/InvSysConResistance.java +++ b/src/main/java/logisticspipes/network/packets/pipe/InvSysConResistance.java @@ -30,7 +30,7 @@ public void processPacket(EntityPlayer player) { } if (pipe.pipe instanceof PipeItemsInvSysConnector) { PipeItemsInvSysConnector invCon = (PipeItemsInvSysConnector) pipe.pipe; - invCon.resistance = getInteger(); + invCon.getModuleItemInvSysConnect().resistance.setValue(getInteger()); } } else { final LogisticsTileGenericPipe pipe = this.getPipe(player.world); @@ -39,7 +39,7 @@ public void processPacket(EntityPlayer player) { } if (pipe.pipe instanceof PipeItemsInvSysConnector) { PipeItemsInvSysConnector invCon = (PipeItemsInvSysConnector) pipe.pipe; - invCon.resistance = getInteger(); + invCon.getModuleItemInvSysConnect().resistance.setValue(getInteger()); invCon.getRouter().update(true, invCon); } } diff --git a/common/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java b/src/main/java/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java similarity index 90% rename from common/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java index c7e550248e..6cc98dd5a9 100644 --- a/common/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java +++ b/src/main/java/logisticspipes/network/packets/pipe/InvSysConSetChannelOnPipePacket.java @@ -1,6 +1,6 @@ package logisticspipes.network.packets.pipe; -import java.util.UUID; +import logisticspipes.utils.FastUUID; import net.minecraft.entity.player.EntityPlayer; @@ -22,7 +22,7 @@ public void processPacket(EntityPlayer player) { LogisticsTileGenericPipe pipe = this.getPipe(player.getEntityWorld(), LTGPCompletionCheck.PIPE); if (pipe.pipe instanceof PipeItemsInvSysConnector) { PipeItemsInvSysConnector conPipe = (PipeItemsInvSysConnector) pipe.pipe; - conPipe.setChannelFromClient(UUID.fromString(getString())); + conPipe.setChannelFromClient(FastUUID.parseUUID(getString())); } } diff --git a/common/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java b/src/main/java/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java similarity index 98% rename from common/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java index a0b7fb8438..a085973379 100644 --- a/common/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java +++ b/src/main/java/logisticspipes/network/packets/pipe/ItemAmountSignUpdatePacket.java @@ -35,7 +35,7 @@ public void processPacket(EntityPlayer player) { return; } - IPipeSign sign = ((CoreRoutedPipe) pipe.pipe).getPipeSign(EnumFacing.getFront(getInteger())); + IPipeSign sign = ((CoreRoutedPipe) pipe.pipe).getPipeSign(EnumFacing.byIndex(getInteger())); if (sign == null) { return; } diff --git a/common/logisticspipes/network/packets/pipe/ItemBufferSyncPacket.java b/src/main/java/logisticspipes/network/packets/pipe/ItemBufferSyncPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/ItemBufferSyncPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/ItemBufferSyncPacket.java diff --git a/common/logisticspipes/network/packets/pipe/MostLikelyRecipeComponentsResponse.java b/src/main/java/logisticspipes/network/packets/pipe/MostLikelyRecipeComponentsResponse.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/MostLikelyRecipeComponentsResponse.java rename to src/main/java/logisticspipes/network/packets/pipe/MostLikelyRecipeComponentsResponse.java diff --git a/common/logisticspipes/network/packets/pipe/ParticleFX.java b/src/main/java/logisticspipes/network/packets/pipe/ParticleFX.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/ParticleFX.java rename to src/main/java/logisticspipes/network/packets/pipe/ParticleFX.java diff --git a/common/logisticspipes/network/packets/pipe/PipeContentPacket.java b/src/main/java/logisticspipes/network/packets/pipe/PipeContentPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeContentPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeContentPacket.java diff --git a/common/logisticspipes/network/packets/pipe/PipeContentRequest.java b/src/main/java/logisticspipes/network/packets/pipe/PipeContentRequest.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeContentRequest.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeContentRequest.java diff --git a/common/logisticspipes/network/packets/pipe/PipeDebugAskForTarget.java b/src/main/java/logisticspipes/network/packets/pipe/PipeDebugAskForTarget.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeDebugAskForTarget.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeDebugAskForTarget.java diff --git a/common/logisticspipes/network/packets/pipe/PipeDebugResponse.java b/src/main/java/logisticspipes/network/packets/pipe/PipeDebugResponse.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeDebugResponse.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeDebugResponse.java diff --git a/common/logisticspipes/network/packets/pipe/PipeFluidUpdate.java b/src/main/java/logisticspipes/network/packets/pipe/PipeFluidUpdate.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeFluidUpdate.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeFluidUpdate.java diff --git a/common/logisticspipes/network/packets/pipe/PipeManagerContentPacket.java b/src/main/java/logisticspipes/network/packets/pipe/PipeManagerContentPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeManagerContentPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeManagerContentPacket.java diff --git a/common/logisticspipes/network/packets/pipe/PipeManagerWatchingPacket.java b/src/main/java/logisticspipes/network/packets/pipe/PipeManagerWatchingPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeManagerWatchingPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeManagerWatchingPacket.java diff --git a/common/logisticspipes/network/packets/pipe/PipePositionPacket.java b/src/main/java/logisticspipes/network/packets/pipe/PipePositionPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipePositionPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/PipePositionPacket.java diff --git a/common/logisticspipes/network/packets/pipe/PipePropertiesUpdate.java b/src/main/java/logisticspipes/network/packets/pipe/PipePropertiesUpdate.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipePropertiesUpdate.java rename to src/main/java/logisticspipes/network/packets/pipe/PipePropertiesUpdate.java diff --git a/common/logisticspipes/network/packets/pipe/PipeSignTypes.java b/src/main/java/logisticspipes/network/packets/pipe/PipeSignTypes.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeSignTypes.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeSignTypes.java diff --git a/common/logisticspipes/network/packets/pipe/PipeTileStatePacket.java b/src/main/java/logisticspipes/network/packets/pipe/PipeTileStatePacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/PipeTileStatePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/PipeTileStatePacket.java diff --git a/common/logisticspipes/network/packets/pipe/RequestChassisOrientationPacket.java b/src/main/java/logisticspipes/network/packets/pipe/RequestChassisOrientationPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/RequestChassisOrientationPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/RequestChassisOrientationPacket.java diff --git a/common/logisticspipes/network/packets/pipe/RequestPipeDimension.java b/src/main/java/logisticspipes/network/packets/pipe/RequestPipeDimension.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/RequestPipeDimension.java rename to src/main/java/logisticspipes/network/packets/pipe/RequestPipeDimension.java diff --git a/common/logisticspipes/network/packets/pipe/RequestRoutingLasersPacket.java b/src/main/java/logisticspipes/network/packets/pipe/RequestRoutingLasersPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/RequestRoutingLasersPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/RequestRoutingLasersPacket.java diff --git a/common/logisticspipes/network/packets/pipe/RequestSignPacket.java b/src/main/java/logisticspipes/network/packets/pipe/RequestSignPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/RequestSignPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/RequestSignPacket.java diff --git a/common/logisticspipes/network/packets/pipe/RoutingLaserPacket.java b/src/main/java/logisticspipes/network/packets/pipe/RoutingLaserPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/RoutingLaserPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/RoutingLaserPacket.java diff --git a/common/logisticspipes/network/packets/pipe/SendQueueContent.java b/src/main/java/logisticspipes/network/packets/pipe/SendQueueContent.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/SendQueueContent.java rename to src/main/java/logisticspipes/network/packets/pipe/SendQueueContent.java diff --git a/common/logisticspipes/network/packets/pipe/SlotFinderActivatePacket.java b/src/main/java/logisticspipes/network/packets/pipe/SlotFinderActivatePacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/SlotFinderActivatePacket.java rename to src/main/java/logisticspipes/network/packets/pipe/SlotFinderActivatePacket.java diff --git a/common/logisticspipes/network/packets/pipe/SlotFinderNumberPacket.java b/src/main/java/logisticspipes/network/packets/pipe/SlotFinderNumberPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/SlotFinderNumberPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/SlotFinderNumberPacket.java diff --git a/common/logisticspipes/network/packets/pipe/SlotFinderOpenGuiPacket.java b/src/main/java/logisticspipes/network/packets/pipe/SlotFinderOpenGuiPacket.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/SlotFinderOpenGuiPacket.java rename to src/main/java/logisticspipes/network/packets/pipe/SlotFinderOpenGuiPacket.java diff --git a/common/logisticspipes/network/packets/pipe/StatUpdate.java b/src/main/java/logisticspipes/network/packets/pipe/StatUpdate.java similarity index 100% rename from common/logisticspipes/network/packets/pipe/StatUpdate.java rename to src/main/java/logisticspipes/network/packets/pipe/StatUpdate.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateAskForTarget.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateAskForTarget.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateAskForTarget.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateAskForTarget.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateCanidatePipe.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateCanidatePipe.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateCanidatePipe.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateCanidatePipe.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateClearClient.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateClearClient.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateClearClient.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateClearClient.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugCanidateList.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugCanidateList.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugCanidateList.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugCanidateList.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugClosedSet.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugClosedSet.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugClosedSet.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugClosedSet.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugFilters.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugFilters.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugFilters.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDebugFilters.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateDoneDebug.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDoneDebug.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateDoneDebug.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateDoneDebug.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateInitDebug.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateInitDebug.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateInitDebug.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateInitDebug.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateSourcePipe.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateSourcePipe.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateSourcePipe.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateSourcePipe.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateTargetResponse.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateTargetResponse.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateTargetResponse.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateTargetResponse.java diff --git a/common/logisticspipes/network/packets/routingdebug/RoutingUpdateUntrace.java b/src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateUntrace.java similarity index 100% rename from common/logisticspipes/network/packets/routingdebug/RoutingUpdateUntrace.java rename to src/main/java/logisticspipes/network/packets/routingdebug/RoutingUpdateUntrace.java diff --git a/common/logisticspipes/network/packets/satpipe/SatelliteSetNamePacket.java b/src/main/java/logisticspipes/network/packets/satpipe/SatelliteSetNamePacket.java similarity index 100% rename from common/logisticspipes/network/packets/satpipe/SatelliteSetNamePacket.java rename to src/main/java/logisticspipes/network/packets/satpipe/SatelliteSetNamePacket.java diff --git a/common/logisticspipes/network/packets/satpipe/SetNameResult.java b/src/main/java/logisticspipes/network/packets/satpipe/SetNameResult.java similarity index 100% rename from common/logisticspipes/network/packets/satpipe/SetNameResult.java rename to src/main/java/logisticspipes/network/packets/satpipe/SetNameResult.java diff --git a/common/logisticspipes/network/packets/satpipe/SyncSatelliteNamePacket.java b/src/main/java/logisticspipes/network/packets/satpipe/SyncSatelliteNamePacket.java similarity index 100% rename from common/logisticspipes/network/packets/satpipe/SyncSatelliteNamePacket.java rename to src/main/java/logisticspipes/network/packets/satpipe/SyncSatelliteNamePacket.java diff --git a/common/logisticspipes/network/packets/upgrade/SneakyUpgradeSidePacket.java b/src/main/java/logisticspipes/network/packets/upgrade/SneakyUpgradeSidePacket.java similarity index 100% rename from common/logisticspipes/network/packets/upgrade/SneakyUpgradeSidePacket.java rename to src/main/java/logisticspipes/network/packets/upgrade/SneakyUpgradeSidePacket.java diff --git a/common/logisticspipes/network/packets/upgrade/ToogleDisconnectionUpgradeSidePacket.java b/src/main/java/logisticspipes/network/packets/upgrade/ToogleDisconnectionUpgradeSidePacket.java similarity index 100% rename from common/logisticspipes/network/packets/upgrade/ToogleDisconnectionUpgradeSidePacket.java rename to src/main/java/logisticspipes/network/packets/upgrade/ToogleDisconnectionUpgradeSidePacket.java diff --git a/common/logisticspipes/pipefxhandlers/EntityModelFX.java b/src/main/java/logisticspipes/pipefxhandlers/EntityModelFX.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/EntityModelFX.java rename to src/main/java/logisticspipes/pipefxhandlers/EntityModelFX.java diff --git a/common/logisticspipes/pipefxhandlers/EntitySparkleFX.java b/src/main/java/logisticspipes/pipefxhandlers/EntitySparkleFX.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/EntitySparkleFX.java rename to src/main/java/logisticspipes/pipefxhandlers/EntitySparkleFX.java diff --git a/common/logisticspipes/pipefxhandlers/GenericSparkleFactory.java b/src/main/java/logisticspipes/pipefxhandlers/GenericSparkleFactory.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/GenericSparkleFactory.java rename to src/main/java/logisticspipes/pipefxhandlers/GenericSparkleFactory.java diff --git a/common/logisticspipes/pipefxhandlers/ParticleProvider.java b/src/main/java/logisticspipes/pipefxhandlers/ParticleProvider.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/ParticleProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/ParticleProvider.java diff --git a/common/logisticspipes/pipefxhandlers/Particles.java b/src/main/java/logisticspipes/pipefxhandlers/Particles.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/Particles.java rename to src/main/java/logisticspipes/pipefxhandlers/Particles.java diff --git a/common/logisticspipes/pipefxhandlers/PipeFXLaserPowerBall.java b/src/main/java/logisticspipes/pipefxhandlers/PipeFXLaserPowerBall.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/PipeFXLaserPowerBall.java rename to src/main/java/logisticspipes/pipefxhandlers/PipeFXLaserPowerBall.java diff --git a/common/logisticspipes/pipefxhandlers/PipeFXLaserPowerBeam.java b/src/main/java/logisticspipes/pipefxhandlers/PipeFXLaserPowerBeam.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/PipeFXLaserPowerBeam.java rename to src/main/java/logisticspipes/pipefxhandlers/PipeFXLaserPowerBeam.java diff --git a/common/logisticspipes/pipefxhandlers/PipeFXRenderHandler.java b/src/main/java/logisticspipes/pipefxhandlers/PipeFXRenderHandler.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/PipeFXRenderHandler.java rename to src/main/java/logisticspipes/pipefxhandlers/PipeFXRenderHandler.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityBlueSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityBlueSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityBlueSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityBlueSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityGoldSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityGoldSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityGoldSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityGoldSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityGreenSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityGreenSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityGreenSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityGreenSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityLightGreenSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityLightGreenSparkleFXProvider.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityLightGreenSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityLightGreenSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityLightRedSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityLightRedSparkleFXProvider.java similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityLightRedSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityLightRedSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityOrangeSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityOrangeSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityOrangeSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityOrangeSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityRedSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityRedSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityRedSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityRedSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityVioletSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityVioletSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityVioletSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityVioletSparkleFXProvider.java diff --git a/common/logisticspipes/pipefxhandlers/providers/EntityWhiteSparkleFXProvider.java b/src/main/java/logisticspipes/pipefxhandlers/providers/EntityWhiteSparkleFXProvider.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipefxhandlers/providers/EntityWhiteSparkleFXProvider.java rename to src/main/java/logisticspipes/pipefxhandlers/providers/EntityWhiteSparkleFXProvider.java diff --git a/common/logisticspipes/pipes/PipeBlockRequestTable.java b/src/main/java/logisticspipes/pipes/PipeBlockRequestTable.java similarity index 85% rename from common/logisticspipes/pipes/PipeBlockRequestTable.java rename to src/main/java/logisticspipes/pipes/PipeBlockRequestTable.java index f84e40c5f7..452f0906d0 100644 --- a/common/logisticspipes/pipes/PipeBlockRequestTable.java +++ b/src/main/java/logisticspipes/pipes/PipeBlockRequestTable.java @@ -8,6 +8,8 @@ import java.util.Map.Entry; import javax.annotation.Nonnull; +import lombok.Getter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.IInventory; @@ -16,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextComponentTranslation; @@ -32,6 +33,8 @@ import logisticspipes.interfaces.IRotationProvider; import logisticspipes.logisticspipes.IRoutedItem; import logisticspipes.logisticspipes.TransportLayer; +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleRequesterTable; import logisticspipes.network.GuiIDs; import logisticspipes.network.PacketHandler; import logisticspipes.network.packets.block.CraftingSetType; @@ -54,25 +57,20 @@ import logisticspipes.utils.item.ItemIdentifier; import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; -import logisticspipes.utils.item.SimpleStackInventory; import logisticspipes.utils.tuples.Pair; public class PipeBlockRequestTable extends PipeItemsRequestLogistics implements ISimpleInventoryEventHandler, IRequestWatcher, IGuiOpenControler, IRotationProvider { - - public SimpleStackInventory diskInv = new SimpleStackInventory(1, "Disk Slot", 1); - public SimpleStackInventory inv = new SimpleStackInventory(27, "Crafting Resources", 64); - public ItemIdentifierInventory matrix = new ItemIdentifierInventory(9, "Crafting Matrix", 1); public ItemIdentifierInventory resultInv = new ItemIdentifierInventory(1, "Crafting Result", 1); - public SimpleStackInventory toSortInv = new SimpleStackInventory(1, "Sorting Slot", 64); + @Getter + private final ModuleRequesterTable moduleRequesterTable; private InventoryCraftResult vanillaResult = new InventoryCraftResult(); private IRecipe cache; private EntityPlayerMP fake; private int delay = 0; private int tick = 0; - private int rotation; private boolean init = false; - private PlayerCollectionList localGuiWatcher = new PlayerCollectionList(); + private final PlayerCollectionList localGuiWatcher = new PlayerCollectionList(); public Map> watchedRequests = new HashMap<>(); private int localLastUsedWatcherId = 0; @@ -80,7 +78,15 @@ public class PipeBlockRequestTable extends PipeItemsRequestLogistics implements public PipeBlockRequestTable(Item item) { super(item); - matrix.addListener(this); + moduleRequesterTable = new ModuleRequesterTable(); + moduleRequesterTable.registerHandler(this, this); + moduleRequesterTable.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); + moduleRequesterTable.matrix.addListener(this); + } + + @Override + public LogisticsModule getLogisticsModule() { + return this.moduleRequesterTable; } @Override @@ -159,7 +165,7 @@ private boolean isDone(LinkedLogisticsOrderList orders) { @Override public void enabledUpdateEntity() { super.enabledUpdateEntity(); - ItemStack stack = toSortInv.getStackInSlot(0); + ItemStack stack = moduleRequesterTable.toSortInv.getStackInSlot(0); if (!stack.isEmpty()) { if (delay > 0) { delay--; @@ -171,7 +177,7 @@ public void enabledUpdateEntity() { EnumFacing dir = getRouteLayer().getOrientationForItem(itemToSend, null); super.queueRoutedItem(itemToSend, dir.getOpposite()); spawnParticle(Particles.OrangeParticle, 4); - toSortInv.clearInventorySlotContents(0); + moduleRequesterTable.toSortInv.clearInventorySlotContents(0); } else { delay = 100; } @@ -183,9 +189,9 @@ public void enabledUpdateEntity() { @Override public void openGui(EntityPlayer entityplayer) { boolean flag = true; - if (!diskInv.getStackInSlot(0).isEmpty()) { + if (!moduleRequesterTable.diskInv.getStackInSlot(0).isEmpty()) { if (!entityplayer.getHeldItemMainhand().isEmpty() && entityplayer.getHeldItemMainhand().getItem().equals(LPItems.disk)) { - diskInv.setInventorySlotContents(0, entityplayer.getHeldItemMainhand()); + moduleRequesterTable.diskInv.setInventorySlotContents(0, entityplayer.getHeldItemMainhand()); entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, ItemStack.EMPTY); flag = false; } @@ -251,9 +257,9 @@ public TextureType getNonRoutedTexture(EnumFacing connection) { @Override public void onAllowedRemoval() { if (MainProxy.isServer(getWorld())) { - inv.dropContents(getWorld(), getPos()); - toSortInv.dropContents(getWorld(), getPos()); - diskInv.dropContents(getWorld(), getPos()); + moduleRequesterTable.inv.dropContents(getWorld(), getPos()); + moduleRequesterTable.toSortInv.dropContents(getWorld(), getPos()); + moduleRequesterTable.diskInv.dropContents(getWorld(), getPos()); } } @@ -263,7 +269,7 @@ public void cacheRecipe() { resultInv.clearInventorySlotContents(0); AutoCraftingInventory craftInv = new AutoCraftingInventory(null); for (int i = 0; i < 9; i++) { - craftInv.setInventorySlotContents(i, matrix.getStackInSlot(i)); + craftInv.setInventorySlotContents(i, moduleRequesterTable.matrix.getStackInSlot(i)); } List list = new ArrayList<>(); for (IRecipe r : CraftingUtil.getRecipeList()) { @@ -280,7 +286,7 @@ public void cacheRecipe() { for (IRecipe recipe : list) { craftInv = new AutoCraftingInventory(null); for (int i = 0; i < 9; i++) { - craftInv.setInventorySlotContents(i, matrix.getStackInSlot(i)); + craftInv.setInventorySlotContents(i, moduleRequesterTable.matrix.getStackInSlot(i)); } ItemStack result = recipe.getCraftingResult(craftInv); if (targetType == ItemIdentifier.get(result)) { @@ -312,7 +318,7 @@ public void cycleRecipe(boolean down) { cache = null; AutoCraftingInventory craftInv = new AutoCraftingInventory(null); for (int i = 0; i < 9; i++) { - craftInv.setInventorySlotContents(i, matrix.getStackInSlot(i)); + craftInv.setInventorySlotContents(i, moduleRequesterTable.matrix.getStackInSlot(i)); } List list = new ArrayList<>(); for (IRecipe r : CraftingUtil.getRecipeList()) { @@ -330,7 +336,7 @@ public void cycleRecipe(boolean down) { } craftInv = new AutoCraftingInventory(null); for (int i = 0; i < 9; i++) { - craftInv.setInventorySlotContents(i, matrix.getStackInSlot(i)); + craftInv.setInventorySlotContents(i, moduleRequesterTable.matrix.getStackInSlot(i)); } if (targetType == ItemIdentifier.get(recipe.getCraftingResult(craftInv))) { if (down) { @@ -351,7 +357,7 @@ public void cycleRecipe(boolean down) { } craftInv = new AutoCraftingInventory(null); for (int i = 0; i < 9; i++) { - craftInv.setInventorySlotContents(i, matrix.getStackInSlot(i)); + craftInv.setInventorySlotContents(i, moduleRequesterTable.matrix.getStackInSlot(i)); } targetType = ItemIdentifier.get(cache.getCraftingResult(craftInv)); } @@ -374,17 +380,17 @@ public ItemStack getOutput(boolean oreDict) { } int[] toUse = new int[9]; - int[] used = new int[inv.getSizeInventory()]; + int[] used = new int[moduleRequesterTable.inv.getSizeInventory()]; outer: for (int i = 0; i < 9; i++) { - ItemStack item = matrix.getStackInSlot(i); + ItemStack item = moduleRequesterTable.matrix.getStackInSlot(i); if (item.isEmpty()) { toUse[i] = -1; continue; } ItemIdentifier ident = ItemIdentifier.get(item); - for (int j = 0; j < inv.getSizeInventory(); j++) { - item = inv.getStackInSlot(j); + for (int j = 0; j < moduleRequesterTable.inv.getSizeInventory(); j++) { + item = moduleRequesterTable.inv.getStackInSlot(j); if (item.isEmpty()) { continue; } @@ -413,7 +419,7 @@ public ItemStack getOutput(boolean oreDict) { for (int i = 0; i < 9; i++) { int j = toUse[i]; if (j != -1) { - crafter.setInventorySlotContents(i, inv.getStackInSlot(j)); + crafter.setInventorySlotContents(i, moduleRequesterTable.inv.getStackInSlot(j)); } } if (!cache.matches(crafter, getWorld())) { @@ -430,7 +436,7 @@ public ItemStack getOutput(boolean oreDict) { for (int i = 0; i < 9; i++) { int j = toUse[i]; if (j != -1) { - crafter.setInventorySlotContents(i, inv.decrStackSize(j, 1)); + crafter.setInventorySlotContents(i, moduleRequesterTable.inv.decrStackSize(j, 1)); } } result = cache.getCraftingResult(crafter); @@ -455,7 +461,7 @@ protected void onCrafting(@Nonnull ItemStack stack) { ItemStack left = crafter.getStackInSlot(i); crafter.setInventorySlotContents(i, ItemStack.EMPTY); if (!left.isEmpty()) { - left.setCount(inv.addCompressed(left, false)); + left.setCount(moduleRequesterTable.inv.addCompressed(left, false)); if (left.getCount() > 0) { ItemIdentifierInventory.dropItems(getWorld(), left, getX(), getY(), getZ()); } @@ -465,7 +471,7 @@ protected void onCrafting(@Nonnull ItemStack stack) { ItemStack left = fake.inventory.getStackInSlot(i); fake.inventory.setInventorySlotContents(i, ItemStack.EMPTY); if (!left.isEmpty()) { - left.setCount(inv.addCompressed(left, false)); + left.setCount(moduleRequesterTable.inv.addCompressed(left, false)); if (left.getCount() > 0) { ItemIdentifierInventory.dropItems(getWorld(), left, getX(), getY(), getZ()); } @@ -484,7 +490,7 @@ public ItemStack getResultForClick() { if (result.isEmpty()) { return ItemStack.EMPTY; } - result.setCount(inv.addCompressed(result, false)); + result.setCount(moduleRequesterTable.inv.addCompressed(result, false)); if (result.getCount() > 0) { return result; } @@ -495,41 +501,19 @@ public ItemStack getResultForClick() { @Override public void InventoryChanged(IInventory inventory) { - if (inventory == matrix) { + if (inventory == moduleRequesterTable.matrix) { cacheRecipe(); } } public void handleNEIRecipePacket(NonNullList content) { - if (matrix.getSizeInventory() != content.size()) throw new IllegalStateException("Different sizes of matrix and inventory from packet"); + if (moduleRequesterTable.matrix.getSizeInventory() != content.size()) throw new IllegalStateException("Different sizes of matrix and inventory from packet"); for (int i = 0; i < content.size(); i++) { - matrix.setInventorySlotContents(i, content.get(i)); + moduleRequesterTable.matrix.setInventorySlotContents(i, content.get(i)); } cacheRecipe(); } - @Override - public void readFromNBT(NBTTagCompound par1nbtTagCompound) { - super.readFromNBT(par1nbtTagCompound); - inv.readFromNBT(par1nbtTagCompound, "inv"); - matrix.readFromNBT(par1nbtTagCompound, "matrix"); - toSortInv.readFromNBT(par1nbtTagCompound, "toSortInv"); - diskInv.readFromNBT(par1nbtTagCompound, "diskInv"); - rotation = par1nbtTagCompound.getInteger("blockRotation"); - //TODO NPEs on world load - //cacheRecipe(); - } - - @Override - public void writeToNBT(NBTTagCompound par1nbtTagCompound) { - super.writeToNBT(par1nbtTagCompound); - inv.writeToNBT(par1nbtTagCompound, "inv"); - matrix.writeToNBT(par1nbtTagCompound, "matrix"); - toSortInv.writeToNBT(par1nbtTagCompound, "toSortInv"); - diskInv.writeToNBT(par1nbtTagCompound, "diskInv"); - par1nbtTagCompound.setInteger("blockRotation", rotation); - } - @Override public boolean isOnSameContainer(CoreRoutedPipe other) { return false; @@ -546,7 +530,7 @@ public void handleItem(IRoutedItem item) { PipeBlockRequestTable.this.notifyOfItemArival(item.getInfo()); if (item.getItemIdentifierStack() != null) { ItemIdentifierStack stack = item.getItemIdentifierStack(); - stack.setStackSize(inv.addCompressed(stack.makeNormalStack(), false)); + stack.setStackSize(moduleRequesterTable.inv.addCompressed(stack.makeNormalStack(), false)); } } @@ -609,17 +593,17 @@ public void handleClientSideRemove(int id) { @Nonnull public ItemStack getDisk() { - return diskInv.getStackInSlot(0); + return moduleRequesterTable.diskInv.getStackInSlot(0); } @Override public int getRotation() { - return rotation; + return moduleRequesterTable.rotation.getValue(); } @Override public void setRotation(int rotation) { - this.rotation = rotation; + moduleRequesterTable.rotation.setValue(rotation); } @Override diff --git a/src/main/java/logisticspipes/pipes/PipeFluidExtractor.java b/src/main/java/logisticspipes/pipes/PipeFluidExtractor.java new file mode 100644 index 0000000000..47b0246ba5 --- /dev/null +++ b/src/main/java/logisticspipes/pipes/PipeFluidExtractor.java @@ -0,0 +1,55 @@ +package logisticspipes.pipes; + +import net.minecraft.item.Item; + +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleFluidExtractor; +import logisticspipes.pipes.basic.fluid.FluidRoutedPipe; +import logisticspipes.textures.Textures; +import logisticspipes.textures.Textures.TextureType; + +public class PipeFluidExtractor extends FluidRoutedPipe { + + private final ModuleFluidExtractor moduleFluidExtractor; + + public PipeFluidExtractor(Item item) { + super(item); + moduleFluidExtractor = new ModuleFluidExtractor(); + moduleFluidExtractor.registerHandler(this, this); + moduleFluidExtractor.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); + } + + @Override + public LogisticsModule getLogisticsModule() { + return this.moduleFluidExtractor; + } + + @Override + public void enabledUpdateEntity() { + super.enabledUpdateEntity(); + if (!isNthTick(10)) { + return; + } + moduleFluidExtractor.tick(); + } + + @Override + public TextureType getCenterTexture() { + return Textures.LOGISTICSPIPE_LIQUID_EXTRACTOR; + } + + @Override + public boolean canInsertToTanks() { + return false; + } + + @Override + public boolean canInsertFromSideToTanks() { + return false; + } + + @Override + public boolean canReceiveFluid() { + return true; + } +} diff --git a/src/main/java/logisticspipes/pipes/PipeFluidInsertion.java b/src/main/java/logisticspipes/pipes/PipeFluidInsertion.java new file mode 100644 index 0000000000..4aba31bb60 --- /dev/null +++ b/src/main/java/logisticspipes/pipes/PipeFluidInsertion.java @@ -0,0 +1,52 @@ +package logisticspipes.pipes; + +import net.minecraft.item.Item; + +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleFluidInsertion; +import logisticspipes.pipes.basic.fluid.FluidRoutedPipe; +import logisticspipes.textures.Textures; +import logisticspipes.textures.Textures.TextureType; + +public class PipeFluidInsertion extends FluidRoutedPipe { + + private final ModuleFluidInsertion moduleFluidInsertion; + + public PipeFluidInsertion(Item item) { + super(item); + moduleFluidInsertion = new ModuleFluidInsertion(); + moduleFluidInsertion.registerHandler(this, this); + moduleFluidInsertion.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); + } + + @Override + public LogisticsModule getLogisticsModule() { + return this.moduleFluidInsertion; + } + + @Override + public void enabledUpdateEntity() { + super.enabledUpdateEntity(); + moduleFluidInsertion.tick(); + } + + @Override + public TextureType getCenterTexture() { + return Textures.LOGISTICSPIPE_LIQUID_INSERTION; + } + + @Override + public boolean canInsertToTanks() { + return false; + } + + @Override + public boolean canInsertFromSideToTanks() { + return false; + } + + @Override + public boolean canReceiveFluid() { + return true; + } +} diff --git a/common/logisticspipes/pipes/PipeFluidProvider.java b/src/main/java/logisticspipes/pipes/PipeFluidProvider.java similarity index 100% rename from common/logisticspipes/pipes/PipeFluidProvider.java rename to src/main/java/logisticspipes/pipes/PipeFluidProvider.java diff --git a/common/logisticspipes/pipes/PipeFluidRequestLogistics.java b/src/main/java/logisticspipes/pipes/PipeFluidRequestLogistics.java similarity index 100% rename from common/logisticspipes/pipes/PipeFluidRequestLogistics.java rename to src/main/java/logisticspipes/pipes/PipeFluidRequestLogistics.java diff --git a/common/logisticspipes/pipes/PipeFluidSatellite.java b/src/main/java/logisticspipes/pipes/PipeFluidSatellite.java similarity index 86% rename from common/logisticspipes/pipes/PipeFluidSatellite.java rename to src/main/java/logisticspipes/pipes/PipeFluidSatellite.java index aa263281da..a248d828c4 100644 --- a/common/logisticspipes/pipes/PipeFluidSatellite.java +++ b/src/main/java/logisticspipes/pipes/PipeFluidSatellite.java @@ -12,13 +12,9 @@ import java.util.Objects; import java.util.Set; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; - -import lombok.Getter; import logisticspipes.LogisticsPipes; import logisticspipes.gui.hud.HUDSatellite; @@ -48,6 +44,8 @@ import logisticspipes.utils.item.ItemIdentifierStack; import network.rs485.logisticspipes.SatellitePipe; +import org.jetbrains.annotations.NotNull; + public class PipeFluidSatellite extends FluidRoutedPipe implements IRequestFluid, IRequireReliableFluidTransport, IHeadUpDisplayRendererProvider, IChestContentReceiver, SatellitePipe { // from baseLogicLiquidSatellite @@ -65,9 +63,6 @@ public static void cleanup() { protected final Map _lostItems = new HashMap<>(); private final ModuleSatellite moduleSatellite; - @Getter - private String satellitePipeName = ""; - public PipeFluidSatellite(Item item) { super(item); throttleTime = 40; @@ -92,7 +87,7 @@ public TextureType getCenterTexture() { } @Override - public @Nullable LogisticsModule getLogisticsModule() { + public LogisticsModule getLogisticsModule() { return moduleSatellite; } @@ -150,7 +145,8 @@ public void stopWatching() { public void playerStartWatching(EntityPlayer player, int mode) { if (mode == 1) { localModeWatchers.add(player); - final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString((this).satellitePipeName).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); + final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class) + .setString(this.moduleSatellite.satellitePipeName.getValue()).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); MainProxy.sendPacketToPlayer(packet, player); updateInv(true); } else { @@ -164,28 +160,8 @@ public void playerStopWatching(EntityPlayer player, int mode) { localModeWatchers.remove(player); } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - if (nbttagcompound.hasKey("satelliteid")) { - int satelliteId = nbttagcompound.getInteger("satelliteid"); - satellitePipeName = Integer.toString(satelliteId); - } else { - satellitePipeName = nbttagcompound.getString("satellitePipeName"); - } - if (MainProxy.isServer(getWorld())) { - ensureAllSatelliteStatus(); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - nbttagcompound.setString("satellitePipeName", satellitePipeName); - super.writeToNBT(nbttagcompound); - } - public void ensureAllSatelliteStatus() { - if (satellitePipeName.isEmpty()) { + if (this.moduleSatellite.satellitePipeName.isEmpty()) { PipeFluidSatellite.AllSatellites.remove(this); } else { PipeFluidSatellite.AllSatellites.add(this); @@ -195,7 +171,7 @@ public void ensureAllSatelliteStatus() { public void updateWatchers() { final LogisticsTileGenericPipe container = Objects.requireNonNull(getContainer()); CoordinatesPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class) - .setString(satellitePipeName) + .setString(this.moduleSatellite.satellitePipeName.getValue()) .setTilePos(container); MainProxy.sendToPlayerList(packet, localModeWatchers); MainProxy.sendPacketToAllWatchingChunk(container, packet); @@ -212,7 +188,8 @@ public void onAllowedRemoval() { @Override public void onWrenchClicked(EntityPlayer entityplayer) { // Send the satellite id when opening gui - final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(satellitePipeName).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); + final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class) + .setString(this.moduleSatellite.satellitePipeName.getValue()).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); MainProxy.sendPacketToPlayer(packet, entityplayer); entityplayer.openGui(LogisticsPipes.instance, GuiIDs.GUI_SatellitePipe_ID, getWorld(), getX(), getY(), getZ()); } @@ -266,9 +243,15 @@ public Set getSatellitesOfType() { return Collections.unmodifiableSet(AllSatellites); } + @NotNull + @Override + public String getSatellitePipeName() { + return this.moduleSatellite.satellitePipeName.getValue(); + } + @Override public void setSatellitePipeName(@Nonnull String satellitePipeName) { - this.satellitePipeName = satellitePipeName; + this.moduleSatellite.satellitePipeName.setValue(satellitePipeName); } @Nonnull diff --git a/common/logisticspipes/pipes/PipeFluidSupplierMk2.java b/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java similarity index 82% rename from common/logisticspipes/pipes/PipeFluidSupplierMk2.java rename to src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java index 9c8e1d7662..62e687234a 100644 --- a/common/logisticspipes/pipes/PipeFluidSupplierMk2.java +++ b/src/main/java/logisticspipes/pipes/PipeFluidSupplierMk2.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidTank; @@ -17,6 +16,8 @@ import logisticspipes.LogisticsPipes; import logisticspipes.interfaces.routing.IRequestFluid; import logisticspipes.interfaces.routing.IRequireReliableFluidTransport; +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleFluidSupplierMK2; import logisticspipes.network.GuiIDs; import logisticspipes.network.PacketHandler; import logisticspipes.network.packets.pipe.FluidSupplierAmount; @@ -28,7 +29,6 @@ import logisticspipes.transport.PipeFluidTransportLogistics; import logisticspipes.utils.FluidIdentifier; import logisticspipes.utils.FluidIdentifierStack; -import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; public class PipeFluidSupplierMk2 extends FluidRoutedPipe implements IRequestFluid, IRequireReliableFluidTransport { @@ -49,9 +49,19 @@ public enum MinMode { } } + private final ModuleFluidSupplierMK2 moduleFluidSupplierMK2; + public PipeFluidSupplierMk2(Item item) { super(item); throttleTime = 100; + moduleFluidSupplierMK2 = new ModuleFluidSupplierMK2(); + moduleFluidSupplierMK2.registerHandler(this, this); + moduleFluidSupplierMK2.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); + } + + @Override + public LogisticsModule getLogisticsModule() { + return this.moduleFluidSupplierMK2; } @Override @@ -94,14 +104,8 @@ public boolean hasGenericInterests() { } //from PipeFluidSupplierMk2 - private ItemIdentifierInventory dummyInventory = new ItemIdentifierInventory(1, "Fluid to keep stocked", 127, true); - private int amount = 0; - private final Map _requestedItems = new HashMap<>(); - private boolean _requestPartials = false; - private MinMode _bucketMinimum = MinMode.ONEBUCKET; - @Override public void throttledUpdateEntity() { if (!isEnabled()) { @@ -111,7 +115,7 @@ public void throttledUpdateEntity() { return; } super.throttledUpdateEntity(); - if (dummyInventory.getIDStackInSlot(0) == null) { + if (moduleFluidSupplierMK2.dummyInventory.getIDStackInSlot(0) == null) { return; } @@ -122,10 +126,10 @@ public void throttledUpdateEntity() { //How much do I want? Map wantFluids = new HashMap<>(); - ItemIdentifierStack stack = dummyInventory.getIDStackInSlot(0); + ItemIdentifierStack stack = moduleFluidSupplierMK2.dummyInventory.getIDStackInSlot(0); if (stack == null) return; FluidIdentifier fIdent = FluidIdentifier.get(stack.getItem()); - wantFluids.put(fIdent, amount); + wantFluids.put(fIdent, moduleFluidSupplierMK2.amount.getValue()); //How much do I have? HashMap haveFluids = new HashMap<>(); @@ -174,7 +178,8 @@ public void throttledUpdateEntity() { if (countToRequest < 1) { continue; } - if (_bucketMinimum.getAmount() != 0 && countToRequest < _bucketMinimum.getAmount()) { + if (moduleFluidSupplierMK2._bucketMinimum.getValue().getAmount() != 0 + && countToRequest < moduleFluidSupplierMK2._bucketMinimum.getValue().getAmount()) { continue; } @@ -184,7 +189,7 @@ public void throttledUpdateEntity() { boolean success = false; - if (_requestPartials) { + if (moduleFluidSupplierMK2._requestPartials.getValue()) { countToRequest = RequestTree.requestFluidPartial(need, countToRequest, this, null); if (countToRequest > 0) { success = true; @@ -207,24 +212,6 @@ public void throttledUpdateEntity() { }); } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - dummyInventory.readFromNBT(nbttagcompound, ""); - _requestPartials = nbttagcompound.getBoolean("requestpartials"); - amount = nbttagcompound.getInteger("amount"); - _bucketMinimum = MinMode.values()[nbttagcompound.getByte("_bucketMinimum")]; - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - dummyInventory.writeToNBT(nbttagcompound, ""); - nbttagcompound.setBoolean("requestpartials", _requestPartials); - nbttagcompound.setInteger("amount", amount); - nbttagcompound.setByte("_bucketMinimum", (byte) _bucketMinimum.ordinal()); - } - private void decreaseRequested(FluidIdentifier liquid, int remaining) { //see if we can get an exact match Integer count = _requestedItems.get(liquid); @@ -265,19 +252,19 @@ public void liquidArrived(FluidIdentifier item, int amount) { public void liquidNotInserted(FluidIdentifier item, int amount) {} public boolean isRequestingPartials() { - return _requestPartials; + return moduleFluidSupplierMK2._requestPartials.getValue(); } public void setRequestingPartials(boolean value) { - _requestPartials = value; + moduleFluidSupplierMK2._requestPartials.setValue(value); } public MinMode getMinMode() { - return _bucketMinimum; + return moduleFluidSupplierMK2._bucketMinimum.getValue(); } public void setMinMode(MinMode value) { - _bucketMinimum = value; + moduleFluidSupplierMK2._bucketMinimum.setValue(value); } @Override @@ -286,25 +273,26 @@ public void onWrenchClicked(EntityPlayer entityplayer) { } public IInventory getDummyInventory() { - return dummyInventory; + return moduleFluidSupplierMK2.dummyInventory; } public int getAmount() { - return amount; + return moduleFluidSupplierMK2.amount.getValue(); } public void setAmount(int amount) { if (MainProxy.isClient(Objects.requireNonNull(container).getWorld())) { - this.amount = amount; + moduleFluidSupplierMK2.amount.setValue(amount); } } public void changeFluidAmount(int change, EntityPlayer player) { - amount += change; - if (amount <= 0) { - amount = 0; + moduleFluidSupplierMK2.amount.increase(change); + if (moduleFluidSupplierMK2.amount.getValue() <= 0) { + moduleFluidSupplierMK2.amount.setValue(0); } - MainProxy.sendPacketToPlayer(PacketHandler.getPacket(FluidSupplierAmount.class).setInteger(amount).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), player); + MainProxy.sendPacketToPlayer(PacketHandler.getPacket(FluidSupplierAmount.class) + .setInteger(moduleFluidSupplierMK2.amount.getValue()).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), player); } @Override diff --git a/common/logisticspipes/pipes/PipeItemsBasicLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsBasicLogistics.java similarity index 100% rename from common/logisticspipes/pipes/PipeItemsBasicLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsBasicLogistics.java diff --git a/common/logisticspipes/pipes/PipeItemsCraftingLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsCraftingLogistics.java old mode 100755 new mode 100644 similarity index 100% rename from common/logisticspipes/pipes/PipeItemsCraftingLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsCraftingLogistics.java diff --git a/common/logisticspipes/pipes/PipeItemsFirewall.java b/src/main/java/logisticspipes/pipes/PipeItemsFirewall.java similarity index 64% rename from common/logisticspipes/pipes/PipeItemsFirewall.java rename to src/main/java/logisticspipes/pipes/PipeItemsFirewall.java index 4159b2ebe4..a8d7f38702 100644 --- a/common/logisticspipes/pipes/PipeItemsFirewall.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsFirewall.java @@ -4,9 +4,12 @@ import javax.annotation.Nullable; +import logisticspipes.modules.ModuleFirewall; + +import lombok.Getter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; import logisticspipes.LogisticsPipes; import logisticspipes.interfaces.routing.IFilter; @@ -20,23 +23,27 @@ import logisticspipes.textures.Textures; import logisticspipes.textures.Textures.TextureType; import logisticspipes.utils.item.ItemIdentifier; -import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; import logisticspipes.utils.tuples.Pair; import network.rs485.logisticspipes.world.DoubleCoordinates; public class PipeItemsFirewall extends CoreRoutedPipe { - public ItemIdentifierInventory inv = new ItemIdentifierInventory(6 * 6, "Filter Inv", 1); - private boolean blockProvider = false; - private boolean blockCrafter = false; - private boolean blockSorting = false; - private boolean blockPower = true; - private boolean isBlocking = true; + @Getter + private final ModuleFirewall moduleFirewall; private IFilter filter = null; public PipeItemsFirewall(Item item) { super(item); + moduleFirewall = new ModuleFirewall(); + moduleFirewall.registerHandler(this, this); + moduleFirewall.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); + } + + @Nullable + @Override + public LogisticsModule getLogisticsModule() { + return this.moduleFirewall; } @Override @@ -50,72 +57,43 @@ public void onWrenchClicked(EntityPlayer entityplayer) { MainProxy.sendPacketToPlayer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), entityplayer); } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - inv.writeToNBT(nbttagcompound); - nbttagcompound.setBoolean("blockProvider", blockProvider); - nbttagcompound.setBoolean("blockCrafer", blockCrafter); - nbttagcompound.setBoolean("blockSorting", blockSorting); - nbttagcompound.setBoolean("blockPower", blockPower); - nbttagcompound.setBoolean("isBlocking", isBlocking); - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - inv.readFromNBT(nbttagcompound); - blockProvider = nbttagcompound.getBoolean("blockProvider"); - blockCrafter = nbttagcompound.getBoolean("blockCrafer"); - blockSorting = nbttagcompound.getBoolean("blockSorting"); - if (nbttagcompound.hasKey("blockPower")) { - blockPower = nbttagcompound.getBoolean("blockPower"); - } - isBlocking = nbttagcompound.getBoolean("isBlocking"); - } - @Override public TextureType getCenterTexture() { return Textures.LOGISTICSPIPE_FIREWALL_TEXTURE; } - @Override - public @Nullable LogisticsModule getLogisticsModule() { - return null; - } - public IFilter getFilter() { if (filter == null) { filter = new IFilter() { @Override public boolean isBlocked() { - return isBlocking; + return moduleFirewall.isBlocking.getValue(); } @Override public boolean isFilteredItem(ItemIdentifier item) { - return inv.containsUndamagedExcludeNBTItem(item.getIgnoringNBT().getUndamaged()); + return moduleFirewall.inv.containsUndamagedExcludeNBTItem(item.getIgnoringNBT().getUndamaged()); } @Override public boolean blockProvider() { - return blockProvider; + return moduleFirewall.blockProvider.getValue(); } @Override public boolean blockCrafting() { - return blockCrafter; + return moduleFirewall.blockCrafter.getValue(); } @Override public boolean blockRouting() { - return blockSorting; + return moduleFirewall.blockSorting.getValue(); } @Override public boolean blockPower() { - return blockPower; + return moduleFirewall.blockPower.getValue(); } @Override @@ -135,8 +113,7 @@ public DoubleCoordinates getLPPosition() { @Override public boolean isFilteredItem(IResource resultItem) { - for (Pair pair : inv) { - ItemIdentifierStack stack = pair.getValue1(); + for (ItemIdentifierStack stack : moduleFirewall.inv) { if (stack != null && resultItem.matches(stack.getItem(), IResource.MatchSettings.NORMAL)) { return true; } @@ -149,66 +126,66 @@ public boolean isFilteredItem(IResource resultItem) { } public boolean isBlockProvider() { - return blockProvider; + return moduleFirewall.blockProvider.getValue(); } public void setBlockProvider(boolean blockProvider) { - this.blockProvider = blockProvider; + moduleFirewall.blockProvider.setValue(blockProvider); MainProxy.sendPacketToServer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ())); } public boolean isBlockCrafter() { - return blockCrafter; + return moduleFirewall.blockCrafter.getValue(); } public void setBlockCrafter(boolean blockCrafter) { - this.blockCrafter = blockCrafter; + moduleFirewall.blockCrafter.setValue(blockCrafter); MainProxy.sendPacketToServer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ())); } public boolean isBlockSorting() { - return blockSorting; + return moduleFirewall.blockSorting.getValue(); } public void setBlockSorting(boolean blockSorting) { - this.blockSorting = blockSorting; + moduleFirewall.blockSorting.setValue(blockSorting); MainProxy.sendPacketToServer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ())); } public boolean isBlockPower() { - return blockPower; + return moduleFirewall.blockPower.getValue(); } public void setBlockPower(boolean blockPower) { - this.blockPower = blockPower; + moduleFirewall.blockPower.setValue(blockPower); MainProxy.sendPacketToServer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ())); } public boolean isBlocking() { - return isBlocking; + return moduleFirewall.isBlocking.getValue(); } public void setBlocking(boolean isBlocking) { - this.isBlocking = isBlocking; + moduleFirewall.isBlocking.setValue(isBlocking); MainProxy.sendPacketToServer(PacketHandler.getPacket(FireWallFlag.class).setFlags(getFlags()).setPosX(getX()).setPosY(getY()).setPosZ(getZ())); } private BitSet getFlags() { BitSet flags = new BitSet(); - flags.set(0, blockProvider); - flags.set(1, blockCrafter); - flags.set(2, blockSorting); - flags.set(3, blockPower); - flags.set(4, isBlocking); + flags.set(0, moduleFirewall.blockProvider.getValue()); + flags.set(1, moduleFirewall.blockCrafter.getValue()); + flags.set(2, moduleFirewall.blockSorting.getValue()); + flags.set(3, moduleFirewall.blockPower.getValue()); + flags.set(4, moduleFirewall.isBlocking.getValue()); return flags; } public void setFlags(BitSet flags) { - blockProvider = flags.get(0); - blockCrafter = flags.get(1); - blockSorting = flags.get(2); - blockPower = flags.get(3); - isBlocking = flags.get(4); + moduleFirewall.blockProvider.setValue(flags.get(0)); + moduleFirewall.blockCrafter.setValue(flags.get(1)); + moduleFirewall.blockSorting.setValue(flags.get(2)); + moduleFirewall.blockPower.setValue(flags.get(3)); + moduleFirewall.isBlocking.setValue(flags.get(4)); } @Override diff --git a/common/logisticspipes/pipes/PipeItemsFluidSupplier.java b/src/main/java/logisticspipes/pipes/PipeItemsFluidSupplier.java similarity index 75% rename from common/logisticspipes/pipes/PipeItemsFluidSupplier.java rename to src/main/java/logisticspipes/pipes/PipeItemsFluidSupplier.java index e3b4241ec8..3ecbf29822 100644 --- a/common/logisticspipes/pipes/PipeItemsFluidSupplier.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsFluidSupplier.java @@ -2,15 +2,11 @@ import java.util.HashMap; import java.util.Map; -import java.util.Map.Entry; import java.util.Objects; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -23,6 +19,7 @@ import logisticspipes.interfaces.routing.IRequestItems; import logisticspipes.interfaces.routing.IRequireReliableTransport; import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleFluidSupplier; import logisticspipes.network.GuiIDs; import logisticspipes.pipes.basic.CoreRoutedPipe; import logisticspipes.proxy.MainProxy; @@ -36,7 +33,6 @@ import logisticspipes.utils.FluidIdentifier; import logisticspipes.utils.FluidIdentifierStack; import logisticspipes.utils.item.ItemIdentifier; -import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; import network.rs485.logisticspipes.connection.LPNeighborTileEntityKt; import network.rs485.logisticspipes.connection.NeighborTileEntity; @@ -45,11 +41,8 @@ public class PipeItemsFluidSupplier extends CoreRoutedPipe implements IRequestItems, IRequireReliableTransport { private boolean _lastRequestFailed = false; - private boolean _requestPartials = false; - - private ItemIdentifierInventory dummyInventory = new ItemIdentifierInventory(9, "Fluids to keep stocked", 127); - private final HashMap _requestedItems = new HashMap<>(); + private final ModuleFluidSupplier moduleFluidSupplier; public PipeItemsFluidSupplier(Item item) { super(new PipeTransportLogistics(true) { @@ -68,6 +61,9 @@ public boolean canPipeConnect(TileEntity tile, EnumFacing dir) { }, item); throttleTime = 100; + moduleFluidSupplier = new ModuleFluidSupplier(); + moduleFluidSupplier.registerHandler(this, this); + moduleFluidSupplier.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); } @Override @@ -85,8 +81,8 @@ public void setRequestFailed(boolean value) { } @Override - public @Nullable LogisticsModule getLogisticsModule() { - return null; + public LogisticsModule getLogisticsModule() { + return moduleFluidSupplier; } @Override @@ -151,9 +147,9 @@ public void throttledUpdateEntity() { } //How much do I want? - Map wantContainers = dummyInventory.getItemsAndCount(); + Map wantContainers = moduleFluidSupplier.filterInventory.getItemsAndCount(); HashMap wantFluids = new HashMap<>(); - for (Entry item : wantContainers.entrySet()) { + for (Map.Entry item : wantContainers.entrySet()) { ItemStack wantItem = item.getKey().unsafeMakeNormalStack(1); FluidStack liquidStack = FluidUtil.getFluidContained(wantItem); if (liquidStack == null) { @@ -176,13 +172,13 @@ public void throttledUpdateEntity() { //HashMap needFluids = new HashMap(); //Reduce what I have and what have been requested already - for (Entry liquidId : wantFluids.entrySet()) { + for (Map.Entry liquidId : wantFluids.entrySet()) { Integer haveCount = haveFluids.get(liquidId.getKey()); if (haveCount != null) { liquidId.setValue(liquidId.getValue() - haveCount); } } - for (Entry requestedItem : _requestedItems.entrySet()) { + for (Map.Entry requestedItem : moduleFluidSupplier._requestedItems.entrySet()) { ItemStack wantItem = requestedItem.getKey().unsafeMakeNormalStack(1); FluidStack requestedFluidId = FluidUtil.getFluidContained(wantItem); if (requestedFluidId == null) { @@ -218,7 +214,7 @@ public void throttledUpdateEntity() { boolean success = false; - if (_requestPartials) { + if (moduleFluidSupplier._requestPartials.getValue()) { countToRequest = RequestTree.requestPartial(need.makeStack(countToRequest), (IRequestItems) container.pipe, null); if (countToRequest > 0) { success = true; @@ -228,11 +224,11 @@ public void throttledUpdateEntity() { } if (success) { - Integer currentRequest = _requestedItems.get(need); + Integer currentRequest = moduleFluidSupplier._requestedItems.get(need); if (currentRequest == null) { - _requestedItems.put(need, countToRequest); + moduleFluidSupplier._requestedItems.put(need, countToRequest); } else { - _requestedItems.put(need, currentRequest + countToRequest); + moduleFluidSupplier._requestedItems.put(need, currentRequest + countToRequest); } } else { ((PipeItemsFluidSupplier) container.pipe).setRequestFailed(true); @@ -241,63 +237,23 @@ public void throttledUpdateEntity() { } } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - dummyInventory.readFromNBT(nbttagcompound, ""); - _requestPartials = nbttagcompound.getBoolean("requestpartials"); - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - dummyInventory.writeToNBT(nbttagcompound, ""); - nbttagcompound.setBoolean("requestpartials", _requestPartials); - } - - private void decreaseRequested(ItemIdentifierStack item) { - int remaining = item.getStackSize(); - //see if we can get an exact match - Integer count = _requestedItems.get(item.getItem()); - if (count != null) { - _requestedItems.put(item.getItem(), Math.max(0, count - remaining)); - remaining -= count; - } - if (remaining <= 0) { - return; - } - //still remaining... was from fuzzyMatch on a crafter - for (Entry e : _requestedItems.entrySet()) { - if (e.getKey().item == item.getItem().item && e.getKey().itemDamage == item.getItem().itemDamage) { - int expected = e.getValue(); - e.setValue(Math.max(0, expected - remaining)); - remaining -= expected; - } - if (remaining <= 0) { - return; - } - } - //we have no idea what this is, log it. - debug.log("liquid supplier got unexpected item " + item); - } - @Override public void itemLost(ItemIdentifierStack item, IAdditionalTargetInformation info) { - decreaseRequested(item); + moduleFluidSupplier.decreaseRequested(item); } @Override public void itemArrived(ItemIdentifierStack item, IAdditionalTargetInformation info) { - decreaseRequested(item); + moduleFluidSupplier.decreaseRequested(item); delayThrottle(); } public boolean isRequestingPartials() { - return _requestPartials; + return this.moduleFluidSupplier._requestPartials.getValue(); } public void setRequestingPartials(boolean value) { - _requestPartials = value; + this.moduleFluidSupplier._requestPartials.setValue(value); } @Override @@ -307,6 +263,6 @@ public void onWrenchClicked(EntityPlayer entityplayer) { /*** GUI ***/ public IItemIdentifierInventory getDummyInventory() { - return dummyInventory; + return this.moduleFluidSupplier.filterInventory; } } diff --git a/common/logisticspipes/pipes/PipeItemsInvSysConnector.java b/src/main/java/logisticspipes/pipes/PipeItemsInvSysConnector.java similarity index 93% rename from common/logisticspipes/pipes/PipeItemsInvSysConnector.java rename to src/main/java/logisticspipes/pipes/PipeItemsInvSysConnector.java index 9a194e59ac..7ed115447d 100644 --- a/common/logisticspipes/pipes/PipeItemsInvSysConnector.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsInvSysConnector.java @@ -16,10 +16,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import lombok.Getter; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -33,6 +34,7 @@ import logisticspipes.interfaces.routing.IChannelRoutingConnection; import logisticspipes.logisticspipes.IRoutedItem; import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleItemInvSysConnect; import logisticspipes.network.NewGuiHandler; import logisticspipes.network.PacketHandler; import logisticspipes.network.guis.pipe.InvSysConGuiProvider; @@ -64,7 +66,6 @@ public class PipeItemsInvSysConnector extends CoreRoutedPipe implements IChannel private boolean init = false; private HashMap> itemsOnRoute = new HashMap<>(); - public int resistance; public Set oldList = new TreeSet<>(); public final LinkedList displayList = new LinkedList<>(); public final PlayerCollectionList localModeWatchers = new PlayerCollectionList(); @@ -72,10 +73,14 @@ public class PipeItemsInvSysConnector extends CoreRoutedPipe implements IChannel private HUDInvSysConnector HUD = new HUDInvSysConnector(this); private UUID idBuffer = UUID.randomUUID(); - private UUID connectedChannel; + @Getter + private final ModuleItemInvSysConnect moduleItemInvSysConnect; public PipeItemsInvSysConnector(Item item) { super(new TransportInvConnection(), item); + moduleItemInvSysConnect = new ModuleItemInvSysConnect(); + moduleItemInvSysConnect.registerHandler(this, this); + moduleItemInvSysConnect.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); } @Override @@ -84,7 +89,7 @@ public void enabledUpdateEntity() { if (!init) { if (hasConnectionUUID()) { if (!SimpleServiceLocator.connectionManager.addChannelConnection(getConnectionUUID(), getRouter())) { - connectedChannel = null; + moduleItemInvSysConnect.connectedChannel.setValue(null); sendChannelInformationToPlayers(); } List connectedPipes = SimpleServiceLocator.connectionManager.getConnectedPipes(getRouter()); @@ -206,11 +211,11 @@ public void sendStack(ItemRoutingInformation info, EnumFacing dir) { private static UUID testUUID = UUID.randomUUID(); private UUID getConnectionUUID() { - return connectedChannel; + return moduleItemInvSysConnect.connectedChannel.getValue(); } private boolean hasConnectionUUID() { - return connectedChannel != null; + return moduleItemInvSysConnect.connectedChannel.getValue() != null; } public Set getExpectedItems() { @@ -263,26 +268,6 @@ public void onChunkUnload() { super.onChunkUnload(); } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - nbttagcompound.setInteger("resistance", resistance); - if (connectedChannel != null) { - nbttagcompound.setString("connectedChannel", connectedChannel.toString()); - } - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - resistance = nbttagcompound.getInteger("resistance"); - if (nbttagcompound.hasKey("connectedChannel")) { - connectedChannel = UUID.fromString(nbttagcompound.getString("connectedChannel")); - } else { - connectedChannel = null; - } - } - private boolean hasRemoteConnection() { return hasConnectionUUID() && getWorld() != null && SimpleServiceLocator.connectionManager.hasChannelConnection(getRouter()); } @@ -308,8 +293,8 @@ public TextureType getCenterTexture() { } @Override - public @Nullable LogisticsModule getLogisticsModule() { - return null; + public LogisticsModule getLogisticsModule() { + return moduleItemInvSysConnect; } @Override @@ -319,7 +304,7 @@ public ItemSendMode getItemSendMode() { @Override public int getConnectionResistance() { - return resistance; + return moduleItemInvSysConnect.resistance.getValue(); } @Override @@ -418,14 +403,14 @@ public void setOrderManagerContent(Collection list) { } public void setChannelFromClient(UUID fromString) { - this.connectedChannel = fromString; + moduleItemInvSysConnect.connectedChannel.setValue(fromString); sendChannelInformationToPlayers(); } @Override public void guiOpenedByPlayer(EntityPlayer player) { localGuiWatchers.add(player); - MainProxy.sendPacketToPlayer(PacketHandler.getPacket(InvSysConResistance.class).setInteger(this.resistance).setBlockPos(this.getPos()), player); + MainProxy.sendPacketToPlayer(PacketHandler.getPacket(InvSysConResistance.class).setInteger(moduleItemInvSysConnect.resistance.getValue()).setBlockPos(this.getPos()), player); IChannelManager manager = SimpleServiceLocator.channelManagerProvider.getChannelManager(this.getWorld()); Optional channel = manager.getChannels().stream() diff --git a/common/logisticspipes/pipes/PipeItemsProviderLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsProviderLogistics.java similarity index 100% rename from common/logisticspipes/pipes/PipeItemsProviderLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsProviderLogistics.java diff --git a/common/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java similarity index 95% rename from common/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java index bb4b0d08c7..d77e0c3782 100644 --- a/common/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsRemoteOrdererLogistics.java @@ -1,7 +1,5 @@ package logisticspipes.pipes; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; @@ -47,7 +45,7 @@ public boolean handleClick(EntityPlayer entityplayer, SecuritySettings settings) } @Override - public @Nullable LogisticsModule getLogisticsModule() { + public LogisticsModule getLogisticsModule() { return null; } diff --git a/common/logisticspipes/pipes/PipeItemsRequestLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsRequestLogistics.java similarity index 100% rename from common/logisticspipes/pipes/PipeItemsRequestLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsRequestLogistics.java diff --git a/common/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java b/src/main/java/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java similarity index 71% rename from common/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java rename to src/main/java/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java index d053e0cf5d..cf619ead35 100644 --- a/common/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsRequestLogisticsMk2.java @@ -2,12 +2,14 @@ import javax.annotation.Nonnull; +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleItemsRequestLogisticsMk2; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextComponentTranslation; import logisticspipes.LPItems; @@ -17,15 +19,16 @@ import logisticspipes.security.SecuritySettings; import logisticspipes.textures.Textures; import logisticspipes.textures.Textures.TextureType; -import network.rs485.logisticspipes.util.items.ItemStackLoader; public class PipeItemsRequestLogisticsMk2 extends PipeItemsRequestLogistics { - @Nonnull - private ItemStack disk = ItemStack.EMPTY; + private final ModuleItemsRequestLogisticsMk2 module; public PipeItemsRequestLogisticsMk2(Item item) { super(item); + module = new ModuleItemsRequestLogisticsMk2(); + module.registerHandler(this, this); + module.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); } @Override @@ -47,9 +50,9 @@ public boolean handleClick(EntityPlayer entityplayer, SecuritySettings settings) @Override public void openGui(EntityPlayer entityplayer) { boolean flag = true; - if (disk.isEmpty()) { + if (module.disk.isEmpty()) { if (!entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND).isEmpty() && entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND).getItem().equals(LPItems.disk)) { - disk = entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND); + module.disk.setValue(entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND)); entityplayer.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, ItemStack.EMPTY); flag = false; } @@ -59,25 +62,6 @@ public void openGui(EntityPlayer entityplayer) { } } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - if (!disk.isEmpty()) { - NBTTagCompound itemNBT = new NBTTagCompound(); - disk.writeToNBT(itemNBT); - nbttagcompound.setTag("Disk", itemNBT); - } - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - if (nbttagcompound.hasKey("Disk")) { - NBTTagCompound item = nbttagcompound.getCompoundTag("Disk"); - disk = ItemStackLoader.loadAndFixItemStackFromNBT(item); - } - } - @Override public TextureType getCenterTexture() { return Textures.LOGISTICSPIPE_REQUESTERMK2_TEXTURE; @@ -85,7 +69,7 @@ public TextureType getCenterTexture() { @Nonnull public ItemStack getDisk() { - return disk; + return module.disk.getValue(); } @Override @@ -95,15 +79,20 @@ public void onAllowedRemoval() { } } + @Override + public LogisticsModule getLogisticsModule() { + return module; + } + public void dropDisk() { - if (!disk.isEmpty()) { - EntityItem item = new EntityItem(getWorld(), getX(), getY(), getZ(), disk); + if (!module.disk.isEmpty()) { + EntityItem item = new EntityItem(getWorld(), getX(), getY(), getZ(), module.disk.getValue()); getWorld().spawnEntity(item); - disk = ItemStack.EMPTY; + module.disk.setValue(ItemStack.EMPTY); } } public void setDisk(@Nonnull ItemStack itemstack) { - disk = itemstack; + module.disk.setValue(itemstack); } } diff --git a/common/logisticspipes/pipes/PipeItemsSatelliteLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsSatelliteLogistics.java similarity index 86% rename from common/logisticspipes/pipes/PipeItemsSatelliteLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsSatelliteLogistics.java index e2e533b90d..82cca01838 100644 --- a/common/logisticspipes/pipes/PipeItemsSatelliteLogistics.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsSatelliteLogistics.java @@ -18,13 +18,11 @@ import java.util.WeakHashMap; import java.util.stream.Collectors; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import lombok.Getter; +import org.jetbrains.annotations.NotNull; import logisticspipes.LogisticsPipes; import logisticspipes.gui.hud.HUDSatellite; @@ -69,9 +67,6 @@ public static void cleanup() { protected final LinkedList _lostItems = new LinkedList<>(); private final ModuleSatellite moduleSatellite; - @Getter - private String satellitePipeName = ""; - public PipeItemsSatelliteLogistics(Item item) { super(item); throttleTime = 40; @@ -94,7 +89,7 @@ public void enabledUpdateEntity() { } @Override - public @Nullable LogisticsModule getLogisticsModule() { + public LogisticsModule getLogisticsModule() { return moduleSatellite; } @@ -142,7 +137,8 @@ private void updateInv(boolean force) { public void playerStartWatching(EntityPlayer player, int mode) { if (mode == 1) { localModeWatchers.add(player); - final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(satellitePipeName).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); + final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(this.moduleSatellite.satellitePipeName.getValue()) + .setPosX(getX()).setPosY(getY()).setPosZ(getZ()); MainProxy.sendPacketToPlayer(packet, player); updateInv(true); } else { @@ -167,37 +163,17 @@ public IHeadUpDisplayRenderer getRenderer() { return HUD; } - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - if (nbttagcompound.hasKey("satelliteid")) { - int satelliteId = nbttagcompound.getInteger("satelliteid"); - satellitePipeName = Integer.toString(satelliteId); - } else { - satellitePipeName = nbttagcompound.getString("satellitePipeName"); - } - if (MainProxy.isServer(getWorld())) { - ensureAllSatelliteStatus(); - } - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - nbttagcompound.setString("satellitePipeName", satellitePipeName); - super.writeToNBT(nbttagcompound); - } - public void ensureAllSatelliteStatus() { - if (satellitePipeName.isEmpty()) { + if (this.moduleSatellite.satellitePipeName.isEmpty()) { PipeItemsSatelliteLogistics.AllSatellites.remove(this); - } - if (!satellitePipeName.isEmpty()) { + } else { PipeItemsSatelliteLogistics.AllSatellites.add(this); } } public void updateWatchers() { - CoordinatesPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(satellitePipeName).setTilePos(this.getContainer()); + CoordinatesPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(this.moduleSatellite.satellitePipeName.getValue()) + .setTilePos(this.getContainer()); MainProxy.sendToPlayerList(packet, localModeWatchers); MainProxy.sendPacketToAllWatchingChunk(this.getContainer(), packet); } @@ -213,7 +189,8 @@ public void onAllowedRemoval() { @Override public void onWrenchClicked(EntityPlayer entityplayer) { // Send the satellite id when opening gui - final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(satellitePipeName).setPosX(getX()).setPosY(getY()).setPosZ(getZ()); + final ModernPacket packet = PacketHandler.getPacket(SyncSatelliteNamePacket.class).setString(this.moduleSatellite.satellitePipeName.getValue()) + .setPosX(getX()).setPosY(getY()).setPosZ(getZ()); MainProxy.sendPacketToPlayer(packet, entityplayer); entityplayer.openGui(LogisticsPipes.instance, GuiIDs.GUI_SatellitePipe_ID, getWorld(), getX(), getY(), getZ()); } @@ -255,7 +232,7 @@ public Set getSatellitesOfType() { @Override public void setSatellitePipeName(@Nonnull String satellitePipeName) { - this.satellitePipeName = satellitePipeName; + this.moduleSatellite.satellitePipeName.setValue(satellitePipeName); } @Nonnull @@ -263,4 +240,10 @@ public void setSatellitePipeName(@Nonnull String satellitePipeName) { public List getItemList() { return itemList; } + + @NotNull + @Override + public String getSatellitePipeName() { + return this.moduleSatellite.satellitePipeName.getValue(); + } } diff --git a/common/logisticspipes/pipes/PipeItemsSupplierLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsSupplierLogistics.java similarity index 99% rename from common/logisticspipes/pipes/PipeItemsSupplierLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsSupplierLogistics.java index fabaf55e3e..f8956c1eb6 100644 --- a/common/logisticspipes/pipes/PipeItemsSupplierLogistics.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsSupplierLogistics.java @@ -8,7 +8,6 @@ package logisticspipes.pipes; import java.util.List; -import javax.annotation.Nonnull; import net.minecraft.item.Item; @@ -23,6 +22,8 @@ import logisticspipes.textures.Textures.TextureType; import logisticspipes.utils.item.ItemIdentifierStack; +import javax.annotation.Nonnull; + public class PipeItemsSupplierLogistics extends CoreRoutedPipe implements IRequestItems, IRequireReliableTransport { private final ModuleActiveSupplier supplierModule; diff --git a/common/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java similarity index 71% rename from common/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java index e8a0fd3c89..26270d4619 100644 --- a/common/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsSystemDestinationLogistics.java @@ -1,32 +1,37 @@ package logisticspipes.pipes; import java.util.Objects; -import java.util.UUID; -import javax.annotation.Nullable; +import logisticspipes.utils.FastUUID; + +import lombok.Getter; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import logisticspipes.LogisticsPipes; import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleItemsSystemDestinationLogistics; import logisticspipes.network.GuiIDs; import logisticspipes.pipefxhandlers.Particles; import logisticspipes.pipes.basic.CoreRoutedPipe; import logisticspipes.textures.Textures; import logisticspipes.textures.Textures.TextureType; -import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; -public class PipeItemsSystemDestinationLogistics extends CoreRoutedPipe { +import javax.annotation.Nullable; - public ItemIdentifierInventory inv = new ItemIdentifierInventory(1, "Freq Slot", 1); +public class PipeItemsSystemDestinationLogistics extends CoreRoutedPipe { + @Getter + private final ModuleItemsSystemDestinationLogistics module; public PipeItemsSystemDestinationLogistics(Item item) { super(item); + module = new ModuleItemsSystemDestinationLogistics(); + module.registerHandler(this, this); + module.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); } @Override @@ -41,11 +46,11 @@ public TextureType getCenterTexture() { @Override public @Nullable LogisticsModule getLogisticsModule() { - return null; + return module; } public Object getTargetUUID() { - final ItemIdentifierStack itemIdent = inv.getIDStackInSlot(0); + final ItemIdentifierStack itemIdent = module.inv.getIDStackInSlot(0); if (itemIdent == null) { return null; } @@ -57,7 +62,7 @@ public Object getTargetUUID() { return null; } spawnParticle(Particles.WhiteParticle, 2); - return UUID.fromString(stack.getTagCompound().getString("UUID")); + return FastUUID.parseUUID(stack.getTagCompound().getString("UUID")); } @Override @@ -65,26 +70,14 @@ public void onAllowedRemoval() { dropFreqCard(); } - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - inv.writeToNBT(nbttagcompound); - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - inv.readFromNBT(nbttagcompound); - } - private void dropFreqCard() { - final ItemIdentifierStack itemident = inv.getIDStackInSlot(0); + final ItemIdentifierStack itemident = module.inv.getIDStackInSlot(0); if (itemident == null) { return; } EntityItem item = new EntityItem(getWorld(), getX(), getY(), getZ(), itemident.makeNormalStack()); getWorld().spawnEntity(item); - inv.clearInventorySlotContents(0); + module.inv.clearInventorySlotContents(0); } @Override diff --git a/common/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java b/src/main/java/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java similarity index 62% rename from common/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java rename to src/main/java/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java index ab61213a9d..a56a57c050 100644 --- a/common/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java +++ b/src/main/java/logisticspipes/pipes/PipeItemsSystemEntranceLogistics.java @@ -2,44 +2,48 @@ import java.util.UUID; -import javax.annotation.Nullable; +import logisticspipes.utils.FastUUID; + +import lombok.Getter; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; import logisticspipes.LogisticsPipes; import logisticspipes.modules.LogisticsModule; import logisticspipes.network.GuiIDs; +import logisticspipes.modules.ModuleItemsSystemEntranceLogistics; import logisticspipes.pipefxhandlers.Particles; import logisticspipes.pipes.basic.CoreRoutedPipe; import logisticspipes.textures.Textures; import logisticspipes.textures.Textures.TextureType; import logisticspipes.transport.EntrencsTransport; -import logisticspipes.utils.item.ItemIdentifierInventory; public class PipeItemsSystemEntranceLogistics extends CoreRoutedPipe { - - public ItemIdentifierInventory inv = new ItemIdentifierInventory(1, "Freq Slot", 1); + @Getter + private final ModuleItemsSystemEntranceLogistics module; public PipeItemsSystemEntranceLogistics(Item item) { super(new EntrencsTransport(), item); ((EntrencsTransport) transport).pipe = this; + module = new ModuleItemsSystemEntranceLogistics(); + module.registerHandler(this, this); + module.registerPosition(LogisticsModule.ModulePositionType.IN_PIPE, 0); } public UUID getLocalFreqUUID() { - if (inv.getStackInSlot(0) == null) { + if (module.inv.getStackInSlot(0) == null) { return null; } - if (!inv.getStackInSlot(0).hasTagCompound()) { + if (!module.inv.getStackInSlot(0).hasTagCompound()) { return null; } - if (!inv.getStackInSlot(0).getTagCompound().hasKey("UUID")) { + if (!module.inv.getStackInSlot(0).getTagCompound().hasKey("UUID")) { return null; } spawnParticle(Particles.WhiteParticle, 2); - return UUID.fromString(inv.getStackInSlot(0).getTagCompound().getString("UUID")); + return FastUUID.parseUUID(module.inv.getStackInSlot(0).getTagCompound().getString("UUID")); } @Override @@ -53,20 +57,8 @@ public TextureType getCenterTexture() { } @Override - public @Nullable LogisticsModule getLogisticsModule() { - return null; - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) { - super.writeToNBT(nbttagcompound); - inv.writeToNBT(nbttagcompound); - } - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) { - super.readFromNBT(nbttagcompound); - inv.readFromNBT(nbttagcompound); + public LogisticsModule getLogisticsModule() { + return module; } @Override @@ -75,12 +67,12 @@ public void onAllowedRemoval() { } private void dropFreqCard() { - if (inv.getStackInSlot(0) == null) { + if (module.inv.getStackInSlot(0) == null) { return; } - EntityItem item = new EntityItem(getWorld(), getX(), getY(), getZ(), inv.getStackInSlot(0)); + EntityItem item = new EntityItem(getWorld(), getX(), getY(), getZ(), module.inv.getStackInSlot(0)); getWorld().spawnEntity(item); - inv.clearInventorySlotContents(0); + module.inv.clearInventorySlotContents(0); } @Override diff --git a/common/logisticspipes/pipes/PipeLogisticsChassis.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassis.java similarity index 82% rename from common/logisticspipes/pipes/PipeLogisticsChassis.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassis.java index b53c67f676..6a47134633 100644 --- a/common/logisticspipes/pipes/PipeLogisticsChassis.java +++ b/src/main/java/logisticspipes/pipes/PipeLogisticsChassis.java @@ -25,18 +25,14 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.fml.client.FMLClientHandler; import lombok.Getter; -import logisticspipes.LPItems; import logisticspipes.LogisticsPipes; import logisticspipes.config.Configs; import logisticspipes.gui.GuiChassisPipe; @@ -90,11 +86,9 @@ import logisticspipes.textures.Textures; import logisticspipes.textures.Textures.TextureType; import logisticspipes.ticks.HudUpdateTick; -import logisticspipes.utils.EnumFacingUtil; import logisticspipes.utils.ISimpleInventoryEventHandler; import logisticspipes.utils.PlayerCollectionList; import logisticspipes.utils.item.ItemIdentifier; -import logisticspipes.utils.item.ItemIdentifierInventory; import logisticspipes.utils.item.ItemIdentifierStack; import logisticspipes.utils.tuples.Pair; import network.rs485.logisticspipes.connection.Adjacent; @@ -113,8 +107,6 @@ public abstract class PipeLogisticsChassis extends CoreRoutedPipe private final ChassisModule _module; // FIXME: remove after 1.12 - private final ItemIdentifierInventory _moduleInventory; - private final NonNullList slotUpgradeManagers = NonNullList.create(); private boolean init = false; // HUD @@ -122,20 +114,17 @@ public abstract class PipeLogisticsChassis extends CoreRoutedPipe public final PlayerCollectionList localModeWatchers = new PlayerCollectionList(); private final HudChassisPipe hud; - @Nullable - private SingleAdjacent pointedAdjacent = null; - public PipeLogisticsChassis(Item item) { super(item); - _moduleInventory = new ItemIdentifierInventory(getChassisSize(), "Chassis pipe", 1); - _moduleInventory.addListener(this); - assert slotUpgradeManagers.size() == 0; // starting at index 0 - for (int i = 0; i < getChassisSize(); i++) { - addModuleUpgradeManager(); - } _module = new ChassisModule(getChassisSize(), this); _module.registerHandler(this, this); - hud = new HudChassisPipe(this, _moduleInventory); + _module.registerPosition(ModulePositionType.IN_PIPE, 0); + assert _module.slotUpgradeManagers.size() == 0; // starting at index 0 + for (int i = 0; i < getChassisSize(); i++) { + _module.addModuleUpgradeManager(); + } + _module._moduleInventory.addListener(this); + hud = new HudChassisPipe(this, _module._moduleInventory.getInvProperty()); } /** @@ -144,17 +133,17 @@ public PipeLogisticsChassis(Item item) { @Nullable @Override public EnumFacing getPointedOrientation() { - if (pointedAdjacent == null) return null; - return pointedAdjacent.getDir(); + if (_module.pointedAdjacent.getValue() == null) return null; + return _module.getAdjacent().getDir(); } @Nonnull protected Adjacent getPointedAdjacentOrNoAdjacent() { // for public access, use getAvailableAdjacent() - if (pointedAdjacent == null) { + if (_module.pointedAdjacent.getValue() == null) { return NoAdjacent.INSTANCE; } else { - return pointedAdjacent; + return _module.pointedAdjacent.getValue(); } } @@ -175,9 +164,9 @@ protected void updateAdjacentCache() { super.updateAdjacentCache(); final Adjacent adjacent = getAdjacent(); if (adjacent instanceof SingleAdjacent) { - pointedAdjacent = ((SingleAdjacent) adjacent); + _module.pointedAdjacent.setValue(adjacent); } else { - final SingleAdjacent oldPointedAdjacent = pointedAdjacent; + final SingleAdjacent oldPointedAdjacent = _module.getAdjacent(); SingleAdjacent newPointedAdjacent = null; if (oldPointedAdjacent != null) { // update pointed adjacent with connection type or reset it @@ -186,7 +175,7 @@ protected void updateAdjacentCache() { if (newPointedAdjacent == null) { newPointedAdjacent = adjacent.neighbors().entrySet().stream().findAny().map(connectedNeighbor -> new SingleAdjacent(this, connectedNeighbor.getKey().getDirection(), connectedNeighbor.getValue())).orElse(null); } - pointedAdjacent = newPointedAdjacent; + _module.pointedAdjacent.setValue(newPointedAdjacent); } } @@ -210,7 +199,7 @@ private Pair, ConnectionType> nextPointedOrientat @Override public void nextOrientation() { - final SingleAdjacent pointedAdjacent = this.pointedAdjacent; + final SingleAdjacent pointedAdjacent = _module.getAdjacent(); Pair, ConnectionType> newNeighbor; if (pointedAdjacent == null) { newNeighbor = nextPointedOrientation(null); @@ -219,11 +208,11 @@ public void nextOrientation() { } final ChassisOrientationPacket packet = PacketHandler.getPacket(ChassisOrientationPacket.class); if (newNeighbor == null) { - this.pointedAdjacent = null; + _module.pointedAdjacent.setValue(null); packet.setDir(null); } else { - this.pointedAdjacent = new SingleAdjacent( - this, newNeighbor.getValue1().getDirection(), newNeighbor.getValue2()); + _module.pointedAdjacent.setValue(new SingleAdjacent( + this, newNeighbor.getValue1().getDirection(), newNeighbor.getValue2())); packet.setDir(newNeighbor.getValue1().getDirection()); } MainProxy.sendPacketToAllWatchingChunk(_module, packet.setTilePos(container)); @@ -233,45 +222,22 @@ public void nextOrientation() { @Override public void setPointedOrientation(@Nullable EnumFacing dir) { if (dir == null) { - pointedAdjacent = null; + _module.pointedAdjacent.setValue(null); } else { - pointedAdjacent = new SingleAdjacent(this, dir, ConnectionType.UNDEFINED); + _module.pointedAdjacent.setValue(new SingleAdjacent(this, dir, ConnectionType.UNDEFINED)); } } - // FIXME: remove after 1.12 - private void updateModuleInventory() { - _module.slottedModules().forEach(slottedModule -> { - if (slottedModule.isEmpty()) { - _moduleInventory.clearInventorySlotContents(slottedModule.getSlot()); - return; - } - final LogisticsModule module = Objects.requireNonNull(slottedModule.getModule()); - final ItemIdentifierStack idStack = _moduleInventory.getIDStackInSlot(slottedModule.getSlot()); - ItemStack moduleStack; - if (idStack != null) { - moduleStack = idStack.getItem().makeNormalStack(1); - } else { - ResourceLocation resourceLocation = LPItems.modules.get(module.getLPName()); - Item item = Item.REGISTRY.getObject(resourceLocation); - if (item == null) return; - moduleStack = new ItemStack(item); - } - ItemModuleInformationManager.saveInformation(moduleStack, module); - _moduleInventory.setInventorySlotContents(slottedModule.getSlot(), moduleStack); - }); - } - @Override @Nonnull public IInventory getModuleInventory() { - updateModuleInventory(); - return _moduleInventory; + _module.updateModuleInventory(); + return _module._moduleInventory; } @Nonnull public ModuleUpgradeManager getModuleUpgradeManager(int slot) { - return slotUpgradeManagers.get(slot); + return _module.slotUpgradeManagers.get(slot); } @Override @@ -289,7 +255,7 @@ public TextureType getRoutedTexture(EnumFacing connection) { @Override public TextureType getNonRoutedTexture(EnumFacing connection) { - if (pointedAdjacent != null && connection.equals(pointedAdjacent.getDir())) { + if (_module.pointedAdjacent.getValue() != null && connection.equals(_module.getAdjacent().getDir())) { return Textures.LOGISTICSPIPE_CHASSI_DIRECTION_TEXTURE; } if (isPowerProvider(connection)) { @@ -298,64 +264,9 @@ public TextureType getNonRoutedTexture(EnumFacing connection) { return Textures.LOGISTICSPIPE_CHASSI_NOTROUTED_TEXTURE; } - @Override - public void readFromNBT(@Nonnull NBTTagCompound tag) { - super.readFromNBT(tag); - _moduleInventory.readFromNBT(tag, "chassi"); - int tmp = tag.getInteger("Orientation"); - if (tmp != -1) { - setPointedOrientation(EnumFacingUtil.getOrientation(tmp % 6)); - } - for (int i = 0; i < getChassisSize(); i++) { - // TODO: remove after 1.12.2 update, backwards compatibility - final ItemIdentifierStack idStack = _moduleInventory.getIDStackInSlot(i); - if (idStack != null && !_module.hasModule(i)) { - final Item stackItem = idStack.getItem().item; - if (stackItem instanceof ItemModule) { - final ItemModule moduleItem = (ItemModule) stackItem; - LogisticsModule module = moduleItem.getModule(null, this, this); - if (module != null) { - _module.installModule(i, module); - } - } - } - // remove end - - if (i >= slotUpgradeManagers.size()) { - addModuleUpgradeManager(); - } - slotUpgradeManagers.get(i).readFromNBT(tag, Integer.toString(i)); - } - - // register slotted modules - _module.slottedModules() - .filter(slottedModule -> !slottedModule.isEmpty()) - .forEach(slottedModule -> { - LogisticsModule logisticsModule = Objects.requireNonNull(slottedModule.getModule()); - // FIXME: rely on getModuleForItem instead - logisticsModule.registerHandler(this, this); - slottedModule.registerPosition(); - }); - } - - private void addModuleUpgradeManager() { - slotUpgradeManagers.add(new ModuleUpgradeManager(this, upgradeManager)); - } - - @Override - public void writeToNBT(@Nonnull NBTTagCompound tag) { - super.writeToNBT(tag); - updateModuleInventory(); - _moduleInventory.writeToNBT(tag, "chassi"); - tag.setInteger("Orientation", pointedAdjacent == null ? -1 : pointedAdjacent.getDir().ordinal()); - for (int i = 0; i < getChassisSize(); i++) { - slotUpgradeManagers.get(i).writeToNBT(tag, Integer.toString(i)); - } - } - @Override public void onAllowedRemoval() { - _moduleInventory.removeListener(this); + _module._moduleInventory.removeListener(this); if (MainProxy.isServer(getWorld())) { for (int i = 0; i < getChassisSize(); i++) { LogisticsModule x = getSubModule(i); @@ -364,8 +275,8 @@ public void onAllowedRemoval() { y.onBlockRemoval(); } } - updateModuleInventory(); - _moduleInventory.dropContents(getWorld(), getX(), getY(), getZ()); + _module.updateModuleInventory(); + _module._moduleInventory.dropContents(getWorld(), getX(), getY(), getZ()); for (int i = 0; i < getChassisSize(); i++) { getModuleUpgradeManager(i).dropUpgrades(); @@ -468,7 +379,7 @@ public void InventoryChanged(IInventory inventory) { if (MainProxy.isServer(getWorld())) { if (!localModeWatchers.isEmpty()) { MainProxy.sendToPlayerList(PacketHandler.getPacket(ChassisPipeModuleContent.class) - .setIdentList(ItemIdentifierStack.getListFromInventory(_moduleInventory)) + .setIdentList(ItemIdentifierStack.getListFromInventory(_module._moduleInventory)) .setPosX(getX()).setPosY(getY()).setPosZ(getZ()), localModeWatchers); } @@ -500,11 +411,11 @@ public TransportLayer getTransportLayer() { } private boolean tryInsertingModule(EntityPlayer entityplayer) { - updateModuleInventory(); - for (int i = 0; i < _moduleInventory.getSizeInventory(); i++) { - if (_moduleInventory.getIDStackInSlot(i) == null) { - _moduleInventory.setInventorySlotContents(i, entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND).splitStack(1)); - InventoryChanged(_moduleInventory); + _module.updateModuleInventory(); + for (int i = 0; i < _module._moduleInventory.getSizeInventory(); i++) { + if (_module._moduleInventory.getIDStackInSlot(i) == null) { + _module._moduleInventory.setInventorySlotContents(i, entityplayer.getItemStackFromSlot(EntityEquipmentSlot.MAINHAND).splitStack(1)); + InventoryChanged(_module._moduleInventory); return true; } } @@ -620,9 +531,9 @@ public void stopWatching() { @Override public void playerStartWatching(EntityPlayer player, int mode) { if (mode == 1) { - updateModuleInventory(); + _module.updateModuleInventory(); localModeWatchers.add(player); - MainProxy.sendPacketToPlayer(PacketHandler.getPacket(ChassisPipeModuleContent.class).setIdentList(ItemIdentifierStack.getListFromInventory(_moduleInventory)).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), player); + MainProxy.sendPacketToPlayer(PacketHandler.getPacket(ChassisPipeModuleContent.class).setIdentList(ItemIdentifierStack.getListFromInventory(_module._moduleInventory)).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), player); MainProxy.sendPacketToPlayer(PacketHandler.getPacket(SendQueueContent.class).setIdentList(ItemIdentifierStack.getListSendQueue(_sendQueue)).setPosX(getX()).setPosY(getY()).setPosZ(getZ()), player); } else { super.playerStartWatching(player, mode); @@ -636,7 +547,7 @@ public void playerStopWatching(EntityPlayer player, int mode) { } public void handleModuleItemIdentifierList(Collection _allItems) { - _moduleInventory.handleItemIdentifierList(_allItems); + _module._moduleInventory.handleItemIdentifierList(_allItems); } @Override @@ -804,13 +715,13 @@ public boolean canCraft(IResource toCraft) { @Nonnull @Override public ISlotUpgradeManager getUpgradeManager(ModulePositionType slot, int positionInt) { - if (slot != ModulePositionType.SLOT || positionInt >= slotUpgradeManagers.size()) { + if (slot != ModulePositionType.SLOT || positionInt >= _module.slotUpgradeManagers.size()) { if (LogisticsPipes.isDEBUG()) { new UnsupportedOperationException("Position info aren't for a chassis pipe. (" + slot + "/" + positionInt + ")").printStackTrace(); } return super.getUpgradeManager(slot, positionInt); } - return slotUpgradeManagers.get(positionInt); + return _module.slotUpgradeManagers.get(positionInt); } @Override diff --git a/common/logisticspipes/pipes/PipeLogisticsChassisMk1.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk1.java similarity index 100% rename from common/logisticspipes/pipes/PipeLogisticsChassisMk1.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk1.java diff --git a/common/logisticspipes/pipes/PipeLogisticsChassisMk2.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk2.java similarity index 100% rename from common/logisticspipes/pipes/PipeLogisticsChassisMk2.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk2.java diff --git a/common/logisticspipes/pipes/PipeLogisticsChassisMk3.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk3.java similarity index 100% rename from common/logisticspipes/pipes/PipeLogisticsChassisMk3.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk3.java diff --git a/common/logisticspipes/pipes/PipeLogisticsChassisMk4.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk4.java similarity index 100% rename from common/logisticspipes/pipes/PipeLogisticsChassisMk4.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk4.java diff --git a/common/logisticspipes/pipes/PipeLogisticsChassisMk5.java b/src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk5.java similarity index 100% rename from common/logisticspipes/pipes/PipeLogisticsChassisMk5.java rename to src/main/java/logisticspipes/pipes/PipeLogisticsChassisMk5.java diff --git a/common/logisticspipes/pipes/SatelliteNamingResult.java b/src/main/java/logisticspipes/pipes/SatelliteNamingResult.java similarity index 100% rename from common/logisticspipes/pipes/SatelliteNamingResult.java rename to src/main/java/logisticspipes/pipes/SatelliteNamingResult.java diff --git a/common/logisticspipes/pipes/basic/CoreMultiBlockPipe.java b/src/main/java/logisticspipes/pipes/basic/CoreMultiBlockPipe.java similarity index 100% rename from common/logisticspipes/pipes/basic/CoreMultiBlockPipe.java rename to src/main/java/logisticspipes/pipes/basic/CoreMultiBlockPipe.java diff --git a/common/logisticspipes/pipes/basic/CoreRoutedPipe.java b/src/main/java/logisticspipes/pipes/basic/CoreRoutedPipe.java similarity index 99% rename from common/logisticspipes/pipes/basic/CoreRoutedPipe.java rename to src/main/java/logisticspipes/pipes/basic/CoreRoutedPipe.java index 8adc294809..6506366e7b 100644 --- a/common/logisticspipes/pipes/basic/CoreRoutedPipe.java +++ b/src/main/java/logisticspipes/pipes/basic/CoreRoutedPipe.java @@ -23,6 +23,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import logisticspipes.utils.*; + import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.crash.CrashReportCategory; @@ -107,12 +109,6 @@ import logisticspipes.textures.Textures.TextureType; import logisticspipes.transport.LPTravelingItem.LPTravelingItemServer; import logisticspipes.transport.PipeTransportLogistics; -import logisticspipes.utils.CacheHolder; -import logisticspipes.utils.EnumFacingUtil; -import logisticspipes.utils.FluidIdentifierStack; -import logisticspipes.utils.OrientationsUtil; -import logisticspipes.utils.PlayerCollectionList; -import logisticspipes.utils.SinkReply; import logisticspipes.utils.item.ItemIdentifier; import logisticspipes.utils.item.ItemIdentifierStack; import logisticspipes.utils.tuples.Pair; @@ -180,7 +176,7 @@ public abstract class CoreRoutedPipe extends CoreUnroutedPipe * @return the adjacent cache directly. */ @Nonnull - protected Adjacent getAdjacent() { + public Adjacent getAdjacent() { return adjacent; } @@ -741,7 +737,7 @@ public void writeToNBT(@Nonnull NBTTagCompound nbttagcompound) { NBTTagCompound powerNBT = new NBTTagCompound(); powerHandler.writeToNBT(powerNBT); - if (!powerNBT.hasNoTags()) { + if (!powerNBT.isEmpty()) { nbttagcompound.setTag("powerHandler", powerNBT); } @@ -833,7 +829,7 @@ public IRouter getRouter() { UUID routerIntId = null; if (routerId != null && !routerId.isEmpty()) { - routerIntId = UUID.fromString(routerId); + routerIntId = FastUUID.parseUUID(routerId); } router = SimpleServiceLocator.routerManager.getOrCreateRouter(routerIntId, getWorld(), getX(), getY(), getZ()); } @@ -1404,7 +1400,7 @@ public Object getPipeForUUID(String sUuid) throws PermissionException { if (!getUpgradeManager().hasCCRemoteControlUpgrade()) { throw new PermissionException(); } - UUID uuid = UUID.fromString(sUuid); + UUID uuid = FastUUID.parseUUID(sUuid); int id = SimpleServiceLocator.routerManager.getIDforUUID(uuid); IRouter router = SimpleServiceLocator.routerManager.getRouter(id); if (router == null) { diff --git a/common/logisticspipes/pipes/basic/CoreUnroutedPipe.java b/src/main/java/logisticspipes/pipes/basic/CoreUnroutedPipe.java similarity index 100% rename from common/logisticspipes/pipes/basic/CoreUnroutedPipe.java rename to src/main/java/logisticspipes/pipes/basic/CoreUnroutedPipe.java diff --git a/common/logisticspipes/pipes/basic/ItemInsertionHandler.java b/src/main/java/logisticspipes/pipes/basic/ItemInsertionHandler.java similarity index 100% rename from common/logisticspipes/pipes/basic/ItemInsertionHandler.java rename to src/main/java/logisticspipes/pipes/basic/ItemInsertionHandler.java diff --git a/common/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java b/src/main/java/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java similarity index 97% rename from common/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java rename to src/main/java/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java index bf1a883b18..8723d4fa2a 100644 --- a/common/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java +++ b/src/main/java/logisticspipes/pipes/basic/LogisticsBlockGenericPipe.java @@ -243,14 +243,14 @@ public static boolean placePipe(CoreUnroutedPipe pipe, World world, BlockPos blo ((LogisticsTileGenericSubMultiBlock) subTile).addSubTypeTo(pos.getType()); } } - world.markAndNotifyBlock(pos.getBlockPos(), world.getChunkFromBlockCoords(pos.getBlockPos()), oldSubBlockState, world.getBlockState(pos.getBlockPos()), 3); + world.markAndNotifyBlock(pos.getBlockPos(), world.getChunk(pos.getBlockPos()), oldSubBlockState, world.getBlockState(pos.getBlockPos()), 3); } LogisticsBlockGenericSubMultiBlock.currentCreatedMultiBlock = null; } tilePipe.initialize(pipe); // tilePipe.sendUpdateToClient(); } - world.markAndNotifyBlock(blockPos, world.getChunkFromBlockCoords(blockPos), oldBlockState, world.getBlockState(blockPos), 3); + world.markAndNotifyBlock(blockPos, world.getChunk(blockPos), oldBlockState, world.getBlockState(blockPos), 3); } return placed; @@ -294,7 +294,7 @@ private static void cacheTileToPreventRemoval(CoreUnroutedPipe pipe) { changed = true; } if (changed) { - worldCache.markAndNotifyBlock(posCache, worldCache.getChunkFromBlockCoords(posCache), worldCache.getBlockState(posCache), worldCache.getBlockState(posCache), 3); + worldCache.markAndNotifyBlock(posCache, worldCache.getChunk(posCache), worldCache.getBlockState(posCache), worldCache.getBlockState(posCache), 3); } fPipe.setPreventRemove(false); return null; @@ -393,7 +393,7 @@ public RayTraceResult collisionRayTrace(IBlockState state, World world, @Nonnull Vec3d vec3d = start.subtract(pos.getX(), pos.getY(), pos.getZ()); Vec3d vec3d1 = end.subtract(pos.getX(), pos.getY(), pos.getZ()); RayTraceResult raytraceresult = FULL_BLOCK_AABB.calculateIntercept(vec3d, vec3d1); - return raytraceresult == null ? null : new RayTraceResult(raytraceresult.hitVec.addVector(pos.getX(), pos.getY(), pos.getZ()), raytraceresult.sideHit, pos); + return raytraceresult == null ? null : new RayTraceResult(raytraceresult.hitVec.add(pos.getX(), pos.getY(), pos.getZ()), raytraceresult.sideHit, pos); } if (tile instanceof LogisticsTileGenericPipe && ((LogisticsTileGenericPipe) tile).pipe == null) { // Fallback for defect pipe return rayTrace(pos, start, end, Block.FULL_BLOCK_AABB); @@ -424,7 +424,7 @@ public InternalRayTraceResult doRayTrace(World world, BlockPos pos, EntityPlayer double eyeHeight = player.getEyeHeight(); Vec3d lookVec = player.getLookVec(); Vec3d start = new Vec3d(player.posX, player.posY + eyeHeight, player.posZ); - Vec3d end = start.addVector(lookVec.x * reachDistance, lookVec.y * reachDistance, lookVec.z * reachDistance); + Vec3d end = start.add(lookVec.x * reachDistance, lookVec.y * reachDistance, lookVec.z * reachDistance); return doRayTrace(world, pos, start, end); } @@ -591,7 +591,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) { @Nonnull @Override - public BlockRenderLayer getBlockLayer() { + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } @@ -770,8 +770,8 @@ public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, En } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { - super.onEntityCollidedWithBlock(world, pos, state, entity); + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { + super.onEntityCollision(world, pos, state, entity); CoreUnroutedPipe pipe = LogisticsBlockGenericPipe.getPipe(world, pos); diff --git a/common/logisticspipes/pipes/basic/LogisticsBlockGenericSubMultiBlock.java b/src/main/java/logisticspipes/pipes/basic/LogisticsBlockGenericSubMultiBlock.java similarity index 100% rename from common/logisticspipes/pipes/basic/LogisticsBlockGenericSubMultiBlock.java rename to src/main/java/logisticspipes/pipes/basic/LogisticsBlockGenericSubMultiBlock.java diff --git a/common/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java b/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java similarity index 99% rename from common/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java rename to src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java index 60cbe17f87..5b2c6ebe0c 100644 --- a/common/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java +++ b/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java @@ -265,7 +265,7 @@ private void refreshRenderState() { } // Pipe Textures for (int i = 0; i < 7; i++) { - EnumFacing o = EnumFacing.getFront(i); + EnumFacing o = EnumFacing.byIndex(i); renderState.textureMatrix.setIconIndex(o, pipe.getIconIndex(o)); } //New Pipe Texture States diff --git a/common/logisticspipes/pipes/basic/LogisticsTileGenericSubMultiBlock.java b/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericSubMultiBlock.java similarity index 100% rename from common/logisticspipes/pipes/basic/LogisticsTileGenericSubMultiBlock.java rename to src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericSubMultiBlock.java diff --git a/common/logisticspipes/pipes/basic/PowerSupplierHandler.java b/src/main/java/logisticspipes/pipes/basic/PowerSupplierHandler.java similarity index 100% rename from common/logisticspipes/pipes/basic/PowerSupplierHandler.java rename to src/main/java/logisticspipes/pipes/basic/PowerSupplierHandler.java diff --git a/common/logisticspipes/pipes/basic/debug/DebugLogController.java b/src/main/java/logisticspipes/pipes/basic/debug/DebugLogController.java similarity index 100% rename from common/logisticspipes/pipes/basic/debug/DebugLogController.java rename to src/main/java/logisticspipes/pipes/basic/debug/DebugLogController.java diff --git a/common/logisticspipes/pipes/basic/debug/LogWindow.java b/src/main/java/logisticspipes/pipes/basic/debug/LogWindow.java similarity index 100% rename from common/logisticspipes/pipes/basic/debug/LogWindow.java rename to src/main/java/logisticspipes/pipes/basic/debug/LogWindow.java diff --git a/common/logisticspipes/pipes/basic/debug/StatusEntry.java b/src/main/java/logisticspipes/pipes/basic/debug/StatusEntry.java similarity index 100% rename from common/logisticspipes/pipes/basic/debug/StatusEntry.java rename to src/main/java/logisticspipes/pipes/basic/debug/StatusEntry.java diff --git a/common/logisticspipes/pipes/basic/fluid/FluidRoutedPipe.java b/src/main/java/logisticspipes/pipes/basic/fluid/FluidRoutedPipe.java similarity index 100% rename from common/logisticspipes/pipes/basic/fluid/FluidRoutedPipe.java rename to src/main/java/logisticspipes/pipes/basic/fluid/FluidRoutedPipe.java diff --git a/common/logisticspipes/pipes/basic/ltgpmodcompat/LPDuctHolderTileEntity.java b/src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPDuctHolderTileEntity.java similarity index 100% rename from common/logisticspipes/pipes/basic/ltgpmodcompat/LPDuctHolderTileEntity.java rename to src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPDuctHolderTileEntity.java diff --git a/common/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java b/src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java similarity index 98% rename from common/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java rename to src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java index 76a1f71fb6..9a7a175a8e 100644 --- a/common/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java +++ b/src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockBlock.java @@ -129,12 +129,12 @@ public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Rand @Override @ModDependentMethod(modId = LPConstants.mcmpModID) - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { Block block = mcmpBlockAccess.getBlock(); if (block != null) { - block.onEntityCollidedWithBlock(world, pos, state, entity); + block.onEntityCollision(world, pos, state, entity); } else { - super.onEntityCollidedWithBlock(world, pos, state, entity); + super.onEntityCollision(world, pos, state, entity); } } diff --git a/common/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockTileEntity.java b/src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockTileEntity.java similarity index 100% rename from common/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockTileEntity.java rename to src/main/java/logisticspipes/pipes/basic/ltgpmodcompat/LPMicroblockTileEntity.java diff --git a/common/logisticspipes/pipes/signs/CraftingPipeSign.java b/src/main/java/logisticspipes/pipes/signs/CraftingPipeSign.java similarity index 99% rename from common/logisticspipes/pipes/signs/CraftingPipeSign.java rename to src/main/java/logisticspipes/pipes/signs/CraftingPipeSign.java index 91118ca7eb..29bf4e28f6 100644 --- a/common/logisticspipes/pipes/signs/CraftingPipeSign.java +++ b/src/main/java/logisticspipes/pipes/signs/CraftingPipeSign.java @@ -101,7 +101,7 @@ public void render(CoreRoutedPipe pipe, LogisticsRenderPipe renderer) { name = item.getItemStackDisplayName(itemstack.unsafeMakeNormalStack()); } catch (Exception e) { try { - name = item.getUnlocalizedName(); + name = item.getTranslationKey(); } catch (Exception ignored) {} } diff --git a/common/logisticspipes/pipes/signs/IPipeSign.java b/src/main/java/logisticspipes/pipes/signs/IPipeSign.java similarity index 100% rename from common/logisticspipes/pipes/signs/IPipeSign.java rename to src/main/java/logisticspipes/pipes/signs/IPipeSign.java diff --git a/common/logisticspipes/pipes/signs/ItemAmountPipeSign.java b/src/main/java/logisticspipes/pipes/signs/ItemAmountPipeSign.java similarity index 99% rename from common/logisticspipes/pipes/signs/ItemAmountPipeSign.java rename to src/main/java/logisticspipes/pipes/signs/ItemAmountPipeSign.java index 1569713ec3..ccfcb089a2 100644 --- a/common/logisticspipes/pipes/signs/ItemAmountPipeSign.java +++ b/src/main/java/logisticspipes/pipes/signs/ItemAmountPipeSign.java @@ -178,7 +178,7 @@ public void render(CoreRoutedPipe pipe, LogisticsRenderPipe renderer) { name = item.getItemStackDisplayName(itemstack); } catch (Exception e) { try { - name = item.getUnlocalizedName(); + name = item.getTranslationKey(); } catch (Exception ignored) {} } diff --git a/common/logisticspipes/pipes/tubes/HSTubeCurve.java b/src/main/java/logisticspipes/pipes/tubes/HSTubeCurve.java similarity index 100% rename from common/logisticspipes/pipes/tubes/HSTubeCurve.java rename to src/main/java/logisticspipes/pipes/tubes/HSTubeCurve.java diff --git a/common/logisticspipes/pipes/tubes/HSTubeGain.java b/src/main/java/logisticspipes/pipes/tubes/HSTubeGain.java similarity index 100% rename from common/logisticspipes/pipes/tubes/HSTubeGain.java rename to src/main/java/logisticspipes/pipes/tubes/HSTubeGain.java diff --git a/common/logisticspipes/pipes/tubes/HSTubeLine.java b/src/main/java/logisticspipes/pipes/tubes/HSTubeLine.java similarity index 100% rename from common/logisticspipes/pipes/tubes/HSTubeLine.java rename to src/main/java/logisticspipes/pipes/tubes/HSTubeLine.java diff --git a/common/logisticspipes/pipes/tubes/HSTubeSCurve.java b/src/main/java/logisticspipes/pipes/tubes/HSTubeSCurve.java similarity index 100% rename from common/logisticspipes/pipes/tubes/HSTubeSCurve.java rename to src/main/java/logisticspipes/pipes/tubes/HSTubeSCurve.java diff --git a/common/logisticspipes/pipes/tubes/HSTubeSpeedup.java b/src/main/java/logisticspipes/pipes/tubes/HSTubeSpeedup.java similarity index 100% rename from common/logisticspipes/pipes/tubes/HSTubeSpeedup.java rename to src/main/java/logisticspipes/pipes/tubes/HSTubeSpeedup.java diff --git a/common/logisticspipes/pipes/unrouted/PipeItemsBasicTransport.java b/src/main/java/logisticspipes/pipes/unrouted/PipeItemsBasicTransport.java similarity index 100% rename from common/logisticspipes/pipes/unrouted/PipeItemsBasicTransport.java rename to src/main/java/logisticspipes/pipes/unrouted/PipeItemsBasicTransport.java diff --git a/common/logisticspipes/pipes/upgrades/ActionSpeedUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/ActionSpeedUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/ActionSpeedUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/ActionSpeedUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/AdvancedSatelliteUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/AdvancedSatelliteUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/AdvancedSatelliteUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/AdvancedSatelliteUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/CCRemoteControlUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/CCRemoteControlUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/CCRemoteControlUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/CCRemoteControlUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/CombinedSneakyUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/CombinedSneakyUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/CombinedSneakyUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/CombinedSneakyUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/ConnectionUpgradeConfig.java b/src/main/java/logisticspipes/pipes/upgrades/ConnectionUpgradeConfig.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/ConnectionUpgradeConfig.java rename to src/main/java/logisticspipes/pipes/upgrades/ConnectionUpgradeConfig.java diff --git a/common/logisticspipes/pipes/upgrades/CraftingByproductUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/CraftingByproductUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/CraftingByproductUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/CraftingByproductUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/CraftingCleanupUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/CraftingCleanupUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/CraftingCleanupUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/CraftingCleanupUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/CraftingMonitoringUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/CraftingMonitoringUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/CraftingMonitoringUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/CraftingMonitoringUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/FluidCraftingUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/FluidCraftingUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/FluidCraftingUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/FluidCraftingUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/FuzzyUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/FuzzyUpgrade.java old mode 100755 new mode 100644 similarity index 96% rename from common/logisticspipes/pipes/upgrades/FuzzyUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/FuzzyUpgrade.java index e7dfd761dd..1df422b1e0 --- a/common/logisticspipes/pipes/upgrades/FuzzyUpgrade.java +++ b/src/main/java/logisticspipes/pipes/upgrades/FuzzyUpgrade.java @@ -1,40 +1,40 @@ -package logisticspipes.pipes.upgrades; - -import logisticspipes.modules.LogisticsModule; -import logisticspipes.modules.ModuleCrafter; -import logisticspipes.modules.ModuleItemSink; -import logisticspipes.pipes.PipeItemsBasicLogistics; -import logisticspipes.pipes.PipeItemsCraftingLogistics; -import logisticspipes.pipes.basic.CoreRoutedPipe; - -public class FuzzyUpgrade implements IPipeUpgrade { - - public static String getName() { - return "fuzzy"; - } - - @Override - public boolean needsUpdate() { - return false; - } - - @Override - public boolean isAllowedForPipe(CoreRoutedPipe pipe) { - return pipe instanceof PipeItemsCraftingLogistics || pipe instanceof PipeItemsBasicLogistics; - } - - @Override - public boolean isAllowedForModule(LogisticsModule pipe) { - return pipe instanceof ModuleCrafter || pipe instanceof ModuleItemSink; - } - - @Override - public String[] getAllowedPipes() { - return new String[] { "crafting", "basic" }; - } - - @Override - public String[] getAllowedModules() { - return new String[] { "crafting", "itemsink" }; - } -} +package logisticspipes.pipes.upgrades; + +import logisticspipes.modules.LogisticsModule; +import logisticspipes.modules.ModuleCrafter; +import logisticspipes.modules.ModuleItemSink; +import logisticspipes.pipes.PipeItemsBasicLogistics; +import logisticspipes.pipes.PipeItemsCraftingLogistics; +import logisticspipes.pipes.basic.CoreRoutedPipe; + +public class FuzzyUpgrade implements IPipeUpgrade { + + public static String getName() { + return "fuzzy"; + } + + @Override + public boolean needsUpdate() { + return false; + } + + @Override + public boolean isAllowedForPipe(CoreRoutedPipe pipe) { + return pipe instanceof PipeItemsCraftingLogistics || pipe instanceof PipeItemsBasicLogistics; + } + + @Override + public boolean isAllowedForModule(LogisticsModule pipe) { + return pipe instanceof ModuleCrafter || pipe instanceof ModuleItemSink; + } + + @Override + public String[] getAllowedPipes() { + return new String[] { "crafting", "basic" }; + } + + @Override + public String[] getAllowedModules() { + return new String[] { "crafting", "itemsink" }; + } +} diff --git a/common/logisticspipes/pipes/upgrades/IConfigPipeUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/IConfigPipeUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/IConfigPipeUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/IConfigPipeUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/IPipeUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/IPipeUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/IPipeUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/IPipeUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/ItemExtractionUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/ItemExtractionUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/ItemExtractionUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/ItemExtractionUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/ItemStackExtractionUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/ItemStackExtractionUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/ItemStackExtractionUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/ItemStackExtractionUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/LogicControllerUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/LogicControllerUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/LogicControllerUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/LogicControllerUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/ModuleUpgradeManager.java b/src/main/java/logisticspipes/pipes/upgrades/ModuleUpgradeManager.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/ModuleUpgradeManager.java rename to src/main/java/logisticspipes/pipes/upgrades/ModuleUpgradeManager.java diff --git a/common/logisticspipes/pipes/upgrades/OpaqueUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/OpaqueUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/OpaqueUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/OpaqueUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/PatternUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/PatternUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/PatternUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/PatternUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/PowerTransportationUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/PowerTransportationUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/PowerTransportationUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/PowerTransportationUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/SneakyUpgradeConfig.java b/src/main/java/logisticspipes/pipes/upgrades/SneakyUpgradeConfig.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/SneakyUpgradeConfig.java rename to src/main/java/logisticspipes/pipes/upgrades/SneakyUpgradeConfig.java diff --git a/common/logisticspipes/pipes/upgrades/SpeedUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/SpeedUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/SpeedUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/SpeedUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/UpgradeManager.java b/src/main/java/logisticspipes/pipes/upgrades/UpgradeManager.java similarity index 99% rename from common/logisticspipes/pipes/upgrades/UpgradeManager.java rename to src/main/java/logisticspipes/pipes/upgrades/UpgradeManager.java index 4e76d2c7b5..6996e66d75 100644 --- a/common/logisticspipes/pipes/upgrades/UpgradeManager.java +++ b/src/main/java/logisticspipes/pipes/upgrades/UpgradeManager.java @@ -4,6 +4,8 @@ import java.util.Objects; import java.util.UUID; +import logisticspipes.utils.FastUUID; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; @@ -257,8 +259,8 @@ public void InventoryChanged(IInventory inventory) { if (!stack.getTagCompound().hasKey("UUID")) { return; } - uuid = UUID.fromString(stack.getTagCompound().getString("UUID")); - uuidS = uuid.toString(); + uuid = FastUUID.parseUUID(stack.getTagCompound().getString("UUID")); + uuidS = FastUUID.toString(uuid); } /* Special implementations */ diff --git a/common/logisticspipes/pipes/upgrades/UpgradeModuleUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/UpgradeModuleUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/UpgradeModuleUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/UpgradeModuleUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/BCPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/BCPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/BCPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/BCPowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/IC2EVPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/IC2EVPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/IC2EVPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/IC2EVPowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/IC2HVPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/IC2HVPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/IC2HVPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/IC2HVPowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/IC2LVPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/IC2LVPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/IC2LVPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/IC2LVPowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/IC2MVPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/IC2MVPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/IC2MVPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/IC2MVPowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/IC2PowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/IC2PowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/IC2PowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/IC2PowerSupplierUpgrade.java diff --git a/common/logisticspipes/pipes/upgrades/power/RFPowerSupplierUpgrade.java b/src/main/java/logisticspipes/pipes/upgrades/power/RFPowerSupplierUpgrade.java similarity index 100% rename from common/logisticspipes/pipes/upgrades/power/RFPowerSupplierUpgrade.java rename to src/main/java/logisticspipes/pipes/upgrades/power/RFPowerSupplierUpgrade.java diff --git a/common/logisticspipes/proxy/ConfigToolHandler.java b/src/main/java/logisticspipes/proxy/ConfigToolHandler.java similarity index 100% rename from common/logisticspipes/proxy/ConfigToolHandler.java rename to src/main/java/logisticspipes/proxy/ConfigToolHandler.java diff --git a/common/logisticspipes/proxy/DontLoadProxy.java b/src/main/java/logisticspipes/proxy/DontLoadProxy.java similarity index 100% rename from common/logisticspipes/proxy/DontLoadProxy.java rename to src/main/java/logisticspipes/proxy/DontLoadProxy.java diff --git a/common/logisticspipes/proxy/MainProxy.java b/src/main/java/logisticspipes/proxy/MainProxy.java similarity index 100% rename from common/logisticspipes/proxy/MainProxy.java rename to src/main/java/logisticspipes/proxy/MainProxy.java diff --git a/common/logisticspipes/proxy/PowerProxy.java b/src/main/java/logisticspipes/proxy/PowerProxy.java similarity index 100% rename from common/logisticspipes/proxy/PowerProxy.java rename to src/main/java/logisticspipes/proxy/PowerProxy.java diff --git a/common/logisticspipes/proxy/ProxyManager.java b/src/main/java/logisticspipes/proxy/ProxyManager.java similarity index 100% rename from common/logisticspipes/proxy/ProxyManager.java rename to src/main/java/logisticspipes/proxy/ProxyManager.java diff --git a/common/logisticspipes/proxy/SimpleServiceLocator.java b/src/main/java/logisticspipes/proxy/SimpleServiceLocator.java similarity index 100% rename from common/logisticspipes/proxy/SimpleServiceLocator.java rename to src/main/java/logisticspipes/proxy/SimpleServiceLocator.java diff --git a/common/logisticspipes/proxy/SpecialInventoryHandlerManager.java b/src/main/java/logisticspipes/proxy/SpecialInventoryHandlerManager.java similarity index 100% rename from common/logisticspipes/proxy/SpecialInventoryHandlerManager.java rename to src/main/java/logisticspipes/proxy/SpecialInventoryHandlerManager.java diff --git a/common/logisticspipes/proxy/SpecialTankHandlerManager.java b/src/main/java/logisticspipes/proxy/SpecialTankHandlerManager.java similarity index 100% rename from common/logisticspipes/proxy/SpecialTankHandlerManager.java rename to src/main/java/logisticspipes/proxy/SpecialTankHandlerManager.java diff --git a/common/logisticspipes/proxy/VersionNotSupportedException.java b/src/main/java/logisticspipes/proxy/VersionNotSupportedException.java similarity index 100% rename from common/logisticspipes/proxy/VersionNotSupportedException.java rename to src/main/java/logisticspipes/proxy/VersionNotSupportedException.java diff --git a/common/logisticspipes/proxy/buildcraft/BCPipeInformationProvider.java b/src/main/java/logisticspipes/proxy/buildcraft/BCPipeInformationProvider.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/BCPipeInformationProvider.java rename to src/main/java/logisticspipes/proxy/buildcraft/BCPipeInformationProvider.java diff --git a/common/logisticspipes/proxy/buildcraft/BuildCraftProxy.java b/src/main/java/logisticspipes/proxy/buildcraft/BuildCraftProxy.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/BuildCraftProxy.java rename to src/main/java/logisticspipes/proxy/buildcraft/BuildCraftProxy.java diff --git a/common/logisticspipes/proxy/buildcraft/BuildCraftToolWrench.java b/src/main/java/logisticspipes/proxy/buildcraft/BuildCraftToolWrench.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/BuildCraftToolWrench.java rename to src/main/java/logisticspipes/proxy/buildcraft/BuildCraftToolWrench.java diff --git a/common/logisticspipes/proxy/buildcraft/recipeprovider/AssemblyTable.java b/src/main/java/logisticspipes/proxy/buildcraft/recipeprovider/AssemblyTable.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/recipeprovider/AssemblyTable.java rename to src/main/java/logisticspipes/proxy/buildcraft/recipeprovider/AssemblyTable.java diff --git a/common/logisticspipes/proxy/buildcraft/subproxies/BCPipeCapabilityProvider.java b/src/main/java/logisticspipes/proxy/buildcraft/subproxies/BCPipeCapabilityProvider.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/subproxies/BCPipeCapabilityProvider.java rename to src/main/java/logisticspipes/proxy/buildcraft/subproxies/BCPipeCapabilityProvider.java diff --git a/common/logisticspipes/proxy/buildcraft/subproxies/IBCPipeCapabilityProvider.java b/src/main/java/logisticspipes/proxy/buildcraft/subproxies/IBCPipeCapabilityProvider.java similarity index 100% rename from common/logisticspipes/proxy/buildcraft/subproxies/IBCPipeCapabilityProvider.java rename to src/main/java/logisticspipes/proxy/buildcraft/subproxies/IBCPipeCapabilityProvider.java diff --git a/common/logisticspipes/proxy/cc/CCConstants.java b/src/main/java/logisticspipes/proxy/cc/CCConstants.java similarity index 100% rename from common/logisticspipes/proxy/cc/CCConstants.java rename to src/main/java/logisticspipes/proxy/cc/CCConstants.java diff --git a/common/logisticspipes/proxy/cc/CCProxy.java b/src/main/java/logisticspipes/proxy/cc/CCProxy.java similarity index 100% rename from common/logisticspipes/proxy/cc/CCProxy.java rename to src/main/java/logisticspipes/proxy/cc/CCProxy.java diff --git a/common/logisticspipes/proxy/cc/LPASMHookCC.java b/src/main/java/logisticspipes/proxy/cc/LPASMHookCC.java similarity index 100% rename from common/logisticspipes/proxy/cc/LPASMHookCC.java rename to src/main/java/logisticspipes/proxy/cc/LPASMHookCC.java diff --git a/common/logisticspipes/proxy/cc/LPPeripheralProvider.java b/src/main/java/logisticspipes/proxy/cc/LPPeripheralProvider.java similarity index 100% rename from common/logisticspipes/proxy/cc/LPPeripheralProvider.java rename to src/main/java/logisticspipes/proxy/cc/LPPeripheralProvider.java diff --git a/common/logisticspipes/proxy/cc/wrapper/CCCommandWrapper.java b/src/main/java/logisticspipes/proxy/cc/wrapper/CCCommandWrapper.java similarity index 100% rename from common/logisticspipes/proxy/cc/wrapper/CCCommandWrapper.java rename to src/main/java/logisticspipes/proxy/cc/wrapper/CCCommandWrapper.java diff --git a/common/logisticspipes/proxy/cc/wrapper/LPPeripheralTilePipeWrapper.java b/src/main/java/logisticspipes/proxy/cc/wrapper/LPPeripheralTilePipeWrapper.java similarity index 100% rename from common/logisticspipes/proxy/cc/wrapper/LPPeripheralTilePipeWrapper.java rename to src/main/java/logisticspipes/proxy/cc/wrapper/LPPeripheralTilePipeWrapper.java diff --git a/common/logisticspipes/proxy/cc/wrapper/LPPeripheralTileSolidWrapper.java b/src/main/java/logisticspipes/proxy/cc/wrapper/LPPeripheralTileSolidWrapper.java similarity index 100% rename from common/logisticspipes/proxy/cc/wrapper/LPPeripheralTileSolidWrapper.java rename to src/main/java/logisticspipes/proxy/cc/wrapper/LPPeripheralTileSolidWrapper.java diff --git a/common/logisticspipes/proxy/ccl/CCLProxy.java b/src/main/java/logisticspipes/proxy/ccl/CCLProxy.java similarity index 100% rename from common/logisticspipes/proxy/ccl/CCLProxy.java rename to src/main/java/logisticspipes/proxy/ccl/CCLProxy.java diff --git a/common/logisticspipes/proxy/ccl/Model3D.java b/src/main/java/logisticspipes/proxy/ccl/Model3D.java similarity index 100% rename from common/logisticspipes/proxy/ccl/Model3D.java rename to src/main/java/logisticspipes/proxy/ccl/Model3D.java diff --git a/common/logisticspipes/proxy/ccl/TransformationProxy.java b/src/main/java/logisticspipes/proxy/ccl/TransformationProxy.java similarity index 100% rename from common/logisticspipes/proxy/ccl/TransformationProxy.java rename to src/main/java/logisticspipes/proxy/ccl/TransformationProxy.java diff --git a/common/logisticspipes/proxy/cofh/CoFHToolHammer.java b/src/main/java/logisticspipes/proxy/cofh/CoFHToolHammer.java similarity index 100% rename from common/logisticspipes/proxy/cofh/CoFHToolHammer.java rename to src/main/java/logisticspipes/proxy/cofh/CoFHToolHammer.java diff --git a/common/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyReceiver.java b/src/main/java/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyReceiver.java similarity index 100% rename from common/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyReceiver.java rename to src/main/java/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyReceiver.java diff --git a/common/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyStorage.java b/src/main/java/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyStorage.java similarity index 100% rename from common/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyStorage.java rename to src/main/java/logisticspipes/proxy/cofh/subproxies/ICoFHEnergyStorage.java diff --git a/common/logisticspipes/proxy/computers/interfaces/CCCommand.java b/src/main/java/logisticspipes/proxy/computers/interfaces/CCCommand.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/CCCommand.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/CCCommand.java diff --git a/common/logisticspipes/proxy/computers/interfaces/CCDirectCall.java b/src/main/java/logisticspipes/proxy/computers/interfaces/CCDirectCall.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/CCDirectCall.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/CCDirectCall.java diff --git a/common/logisticspipes/proxy/computers/interfaces/CCQueued.java b/src/main/java/logisticspipes/proxy/computers/interfaces/CCQueued.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/CCQueued.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/CCQueued.java diff --git a/common/logisticspipes/proxy/computers/interfaces/CCSecurtiyCheck.java b/src/main/java/logisticspipes/proxy/computers/interfaces/CCSecurtiyCheck.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/CCSecurtiyCheck.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/CCSecurtiyCheck.java diff --git a/common/logisticspipes/proxy/computers/interfaces/CCType.java b/src/main/java/logisticspipes/proxy/computers/interfaces/CCType.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/CCType.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/CCType.java diff --git a/common/logisticspipes/proxy/computers/interfaces/ICCTypeWrapped.java b/src/main/java/logisticspipes/proxy/computers/interfaces/ICCTypeWrapped.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/ICCTypeWrapped.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/ICCTypeWrapped.java diff --git a/common/logisticspipes/proxy/computers/interfaces/ILPCCTypeDefinition.java b/src/main/java/logisticspipes/proxy/computers/interfaces/ILPCCTypeDefinition.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/ILPCCTypeDefinition.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/ILPCCTypeDefinition.java diff --git a/common/logisticspipes/proxy/computers/interfaces/ILPCCTypeHolder.java b/src/main/java/logisticspipes/proxy/computers/interfaces/ILPCCTypeHolder.java similarity index 100% rename from common/logisticspipes/proxy/computers/interfaces/ILPCCTypeHolder.java rename to src/main/java/logisticspipes/proxy/computers/interfaces/ILPCCTypeHolder.java diff --git a/common/logisticspipes/proxy/computers/objects/CCFilterInventory.java b/src/main/java/logisticspipes/proxy/computers/objects/CCFilterInventory.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCFilterInventory.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCFilterInventory.java diff --git a/common/logisticspipes/proxy/computers/objects/CCFluidIdentifier.java b/src/main/java/logisticspipes/proxy/computers/objects/CCFluidIdentifier.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCFluidIdentifier.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCFluidIdentifier.java diff --git a/common/logisticspipes/proxy/computers/objects/CCItemIdentifier.java b/src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifier.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCItemIdentifier.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifier.java diff --git a/common/logisticspipes/proxy/computers/objects/CCItemIdentifierBuilder.java b/src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierBuilder.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCItemIdentifierBuilder.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierBuilder.java diff --git a/common/logisticspipes/proxy/computers/objects/CCItemIdentifierInventory.java b/src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierInventory.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCItemIdentifierInventory.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierInventory.java diff --git a/common/logisticspipes/proxy/computers/objects/CCItemIdentifierStack.java b/src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierStack.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCItemIdentifierStack.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCItemIdentifierStack.java diff --git a/common/logisticspipes/proxy/computers/objects/CCPair.java b/src/main/java/logisticspipes/proxy/computers/objects/CCPair.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCPair.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCPair.java diff --git a/common/logisticspipes/proxy/computers/objects/CCQuartet.java b/src/main/java/logisticspipes/proxy/computers/objects/CCQuartet.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCQuartet.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCQuartet.java diff --git a/common/logisticspipes/proxy/computers/objects/CCResource.java b/src/main/java/logisticspipes/proxy/computers/objects/CCResource.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCResource.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCResource.java diff --git a/common/logisticspipes/proxy/computers/objects/CCSinkResponder.java b/src/main/java/logisticspipes/proxy/computers/objects/CCSinkResponder.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCSinkResponder.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCSinkResponder.java diff --git a/common/logisticspipes/proxy/computers/objects/CCTriplet.java b/src/main/java/logisticspipes/proxy/computers/objects/CCTriplet.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/CCTriplet.java rename to src/main/java/logisticspipes/proxy/computers/objects/CCTriplet.java diff --git a/common/logisticspipes/proxy/computers/objects/LPGlobalCCAccess.java b/src/main/java/logisticspipes/proxy/computers/objects/LPGlobalCCAccess.java similarity index 100% rename from common/logisticspipes/proxy/computers/objects/LPGlobalCCAccess.java rename to src/main/java/logisticspipes/proxy/computers/objects/LPGlobalCCAccess.java diff --git a/common/logisticspipes/proxy/computers/wrapper/CCObjectWrapper.java b/src/main/java/logisticspipes/proxy/computers/wrapper/CCObjectWrapper.java similarity index 100% rename from common/logisticspipes/proxy/computers/wrapper/CCObjectWrapper.java rename to src/main/java/logisticspipes/proxy/computers/wrapper/CCObjectWrapper.java diff --git a/common/logisticspipes/proxy/computers/wrapper/CCWrapperInformation.java b/src/main/java/logisticspipes/proxy/computers/wrapper/CCWrapperInformation.java similarity index 100% rename from common/logisticspipes/proxy/computers/wrapper/CCWrapperInformation.java rename to src/main/java/logisticspipes/proxy/computers/wrapper/CCWrapperInformation.java diff --git a/common/logisticspipes/proxy/computers/wrapper/ICommandWrapper.java b/src/main/java/logisticspipes/proxy/computers/wrapper/ICommandWrapper.java similarity index 100% rename from common/logisticspipes/proxy/computers/wrapper/ICommandWrapper.java rename to src/main/java/logisticspipes/proxy/computers/wrapper/ICommandWrapper.java diff --git a/common/logisticspipes/proxy/enderchest/EnderStorageProxy.java b/src/main/java/logisticspipes/proxy/enderchest/EnderStorageProxy.java similarity index 100% rename from common/logisticspipes/proxy/enderchest/EnderStorageProxy.java rename to src/main/java/logisticspipes/proxy/enderchest/EnderStorageProxy.java diff --git a/common/logisticspipes/proxy/endercore/EnderCoreProgressProvider.java b/src/main/java/logisticspipes/proxy/endercore/EnderCoreProgressProvider.java similarity index 100% rename from common/logisticspipes/proxy/endercore/EnderCoreProgressProvider.java rename to src/main/java/logisticspipes/proxy/endercore/EnderCoreProgressProvider.java diff --git a/common/logisticspipes/proxy/ic/IronChestProxy.java b/src/main/java/logisticspipes/proxy/ic/IronChestProxy.java similarity index 100% rename from common/logisticspipes/proxy/ic/IronChestProxy.java rename to src/main/java/logisticspipes/proxy/ic/IronChestProxy.java diff --git a/common/logisticspipes/proxy/ic2/IC2ProgressProvider.java b/src/main/java/logisticspipes/proxy/ic2/IC2ProgressProvider.java similarity index 100% rename from common/logisticspipes/proxy/ic2/IC2ProgressProvider.java rename to src/main/java/logisticspipes/proxy/ic2/IC2ProgressProvider.java diff --git a/common/logisticspipes/proxy/ic2/IC2Proxy.java b/src/main/java/logisticspipes/proxy/ic2/IC2Proxy.java similarity index 100% rename from common/logisticspipes/proxy/ic2/IC2Proxy.java rename to src/main/java/logisticspipes/proxy/ic2/IC2Proxy.java diff --git a/common/logisticspipes/proxy/interfaces/IBCProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IBCProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IBCProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IBCProxy.java diff --git a/common/logisticspipes/proxy/interfaces/ICCLProxy.java b/src/main/java/logisticspipes/proxy/interfaces/ICCLProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/ICCLProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/ICCLProxy.java diff --git a/common/logisticspipes/proxy/interfaces/ICCProxy.java b/src/main/java/logisticspipes/proxy/interfaces/ICCProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/ICCProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/ICCProxy.java diff --git a/common/logisticspipes/proxy/interfaces/ICraftingRecipeProvider.java b/src/main/java/logisticspipes/proxy/interfaces/ICraftingRecipeProvider.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/ICraftingRecipeProvider.java rename to src/main/java/logisticspipes/proxy/interfaces/ICraftingRecipeProvider.java diff --git a/common/logisticspipes/proxy/interfaces/IEnderStorageProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IEnderStorageProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IEnderStorageProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IEnderStorageProxy.java diff --git a/common/logisticspipes/proxy/interfaces/IFuzzyRecipeProvider.java b/src/main/java/logisticspipes/proxy/interfaces/IFuzzyRecipeProvider.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IFuzzyRecipeProvider.java rename to src/main/java/logisticspipes/proxy/interfaces/IFuzzyRecipeProvider.java diff --git a/common/logisticspipes/proxy/interfaces/IGenericProgressProvider.java b/src/main/java/logisticspipes/proxy/interfaces/IGenericProgressProvider.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IGenericProgressProvider.java rename to src/main/java/logisticspipes/proxy/interfaces/IGenericProgressProvider.java diff --git a/common/logisticspipes/proxy/interfaces/IIC2Proxy.java b/src/main/java/logisticspipes/proxy/interfaces/IIC2Proxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IIC2Proxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IIC2Proxy.java diff --git a/common/logisticspipes/proxy/interfaces/IIronChestProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IIronChestProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IIronChestProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IIronChestProxy.java diff --git a/common/logisticspipes/proxy/interfaces/ILPPipeConfigToolWrapper.java b/src/main/java/logisticspipes/proxy/interfaces/ILPPipeConfigToolWrapper.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/ILPPipeConfigToolWrapper.java rename to src/main/java/logisticspipes/proxy/interfaces/ILPPipeConfigToolWrapper.java diff --git a/common/logisticspipes/proxy/interfaces/INEIProxy.java b/src/main/java/logisticspipes/proxy/interfaces/INEIProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/INEIProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/INEIProxy.java diff --git a/common/logisticspipes/proxy/interfaces/IOpenComputersProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IOpenComputersProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IOpenComputersProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IOpenComputersProxy.java diff --git a/common/logisticspipes/proxy/interfaces/IPowerProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IPowerProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IPowerProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IPowerProxy.java diff --git a/common/logisticspipes/proxy/interfaces/IProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IProxy.java diff --git a/common/logisticspipes/proxy/interfaces/ITDProxy.java b/src/main/java/logisticspipes/proxy/interfaces/ITDProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/ITDProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/ITDProxy.java diff --git a/common/logisticspipes/proxy/interfaces/IThermalExpansionProxy.java b/src/main/java/logisticspipes/proxy/interfaces/IThermalExpansionProxy.java similarity index 100% rename from common/logisticspipes/proxy/interfaces/IThermalExpansionProxy.java rename to src/main/java/logisticspipes/proxy/interfaces/IThermalExpansionProxy.java diff --git a/common/logisticspipes/proxy/nei/NEIProxy.java b/src/main/java/logisticspipes/proxy/nei/NEIProxy.java similarity index 100% rename from common/logisticspipes/proxy/nei/NEIProxy.java rename to src/main/java/logisticspipes/proxy/nei/NEIProxy.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/I3DOperation.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/I3DOperation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/I3DOperation.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/I3DOperation.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/IBounds.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/IBounds.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/IBounds.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/IBounds.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/IModel3D.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/IModel3D.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/IModel3D.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/IModel3D.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/IRenderState.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/IRenderState.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/IRenderState.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/IRenderState.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/ITranslation.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/ITranslation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/ITranslation.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/ITranslation.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/IVec3.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/IVec3.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/IVec3.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/IVec3.java diff --git a/common/logisticspipes/proxy/object3d/interfaces/TextureTransformation.java b/src/main/java/logisticspipes/proxy/object3d/interfaces/TextureTransformation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/interfaces/TextureTransformation.java rename to src/main/java/logisticspipes/proxy/object3d/interfaces/TextureTransformation.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPColourMultiplier.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPColourMultiplier.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPColourMultiplier.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPColourMultiplier.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPRotation.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPRotation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPRotation.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPRotation.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPScale.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPScale.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPScale.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPScale.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPTranslation.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPTranslation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPTranslation.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPTranslation.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPUVScale.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPUVScale.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPUVScale.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPUVScale.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPUVTransformationList.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPUVTransformationList.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPUVTransformationList.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPUVTransformationList.java diff --git a/common/logisticspipes/proxy/object3d/operation/LPUVTranslation.java b/src/main/java/logisticspipes/proxy/object3d/operation/LPUVTranslation.java similarity index 100% rename from common/logisticspipes/proxy/object3d/operation/LPUVTranslation.java rename to src/main/java/logisticspipes/proxy/object3d/operation/LPUVTranslation.java diff --git a/common/logisticspipes/proxy/opencomputers/IOCTile.java b/src/main/java/logisticspipes/proxy/opencomputers/IOCTile.java similarity index 100% rename from common/logisticspipes/proxy/opencomputers/IOCTile.java rename to src/main/java/logisticspipes/proxy/opencomputers/IOCTile.java diff --git a/common/logisticspipes/proxy/opencomputers/OpenComputersProxy.java b/src/main/java/logisticspipes/proxy/opencomputers/OpenComputersProxy.java similarity index 100% rename from common/logisticspipes/proxy/opencomputers/OpenComputersProxy.java rename to src/main/java/logisticspipes/proxy/opencomputers/OpenComputersProxy.java diff --git a/common/logisticspipes/proxy/opencomputers/asm/BaseWrapperClass.java b/src/main/java/logisticspipes/proxy/opencomputers/asm/BaseWrapperClass.java similarity index 100% rename from common/logisticspipes/proxy/opencomputers/asm/BaseWrapperClass.java rename to src/main/java/logisticspipes/proxy/opencomputers/asm/BaseWrapperClass.java diff --git a/common/logisticspipes/proxy/opencomputers/asm/ClassCreator.java b/src/main/java/logisticspipes/proxy/opencomputers/asm/ClassCreator.java similarity index 100% rename from common/logisticspipes/proxy/opencomputers/asm/ClassCreator.java rename to src/main/java/logisticspipes/proxy/opencomputers/asm/ClassCreator.java diff --git a/common/logisticspipes/proxy/opencomputers/asm/DummyWrapperClass.java b/src/main/java/logisticspipes/proxy/opencomputers/asm/DummyWrapperClass.java similarity index 100% rename from common/logisticspipes/proxy/opencomputers/asm/DummyWrapperClass.java rename to src/main/java/logisticspipes/proxy/opencomputers/asm/DummyWrapperClass.java diff --git a/common/logisticspipes/proxy/progressprovider/MachineProgressProvider.java b/src/main/java/logisticspipes/proxy/progressprovider/MachineProgressProvider.java similarity index 100% rename from common/logisticspipes/proxy/progressprovider/MachineProgressProvider.java rename to src/main/java/logisticspipes/proxy/progressprovider/MachineProgressProvider.java diff --git a/common/logisticspipes/proxy/recipeproviders/AssemblyAdvancedWorkbench.java b/src/main/java/logisticspipes/proxy/recipeproviders/AssemblyAdvancedWorkbench.java similarity index 100% rename from common/logisticspipes/proxy/recipeproviders/AssemblyAdvancedWorkbench.java rename to src/main/java/logisticspipes/proxy/recipeproviders/AssemblyAdvancedWorkbench.java diff --git a/common/logisticspipes/proxy/recipeproviders/AutoWorkbench.java b/src/main/java/logisticspipes/proxy/recipeproviders/AutoWorkbench.java similarity index 100% rename from common/logisticspipes/proxy/recipeproviders/AutoWorkbench.java rename to src/main/java/logisticspipes/proxy/recipeproviders/AutoWorkbench.java diff --git a/common/logisticspipes/proxy/recipeproviders/LogisticsCraftingTable.java b/src/main/java/logisticspipes/proxy/recipeproviders/LogisticsCraftingTable.java similarity index 100% rename from common/logisticspipes/proxy/recipeproviders/LogisticsCraftingTable.java rename to src/main/java/logisticspipes/proxy/recipeproviders/LogisticsCraftingTable.java diff --git a/common/logisticspipes/proxy/side/ClientProxy.java b/src/main/java/logisticspipes/proxy/side/ClientProxy.java old mode 100755 new mode 100644 similarity index 97% rename from common/logisticspipes/proxy/side/ClientProxy.java rename to src/main/java/logisticspipes/proxy/side/ClientProxy.java index e73099ff9a..520f24f8fc --- a/common/logisticspipes/proxy/side/ClientProxy.java +++ b/src/main/java/logisticspipes/proxy/side/ClientProxy.java @@ -252,7 +252,7 @@ public void openFluidSelectGui(final int slotId) { @Override public void registerModels() { ForgeRegistries.ITEMS.getValuesCollection().stream() - .filter(item -> item.getRegistryName().getResourceDomain().equals(LPConstants.LP_MOD_ID)) + .filter(item -> item.getRegistryName().getNamespace().equals(LPConstants.LP_MOD_ID)) .filter(item -> item instanceof ILogisticsItem) .forEach(item -> registerModels((ILogisticsItem) item)); } @@ -262,14 +262,14 @@ private void registerModels(ILogisticsItem item) { for (int i = 0; i < mc; i++) { String modelPath = item.getModelPath(); if (mc > 1) { - String resourcePath = item.getItem().getRegistryName().getResourcePath(); + String resourcePath = item.getItem().getRegistryName().getPath(); if (modelPath.matches(String.format(".*%s/%s", resourcePath, resourcePath))) { modelPath = String.format("%s/%d", modelPath.substring(0, modelPath.length() - resourcePath.length() - 1), i); } else { modelPath = String.format("%s.%d", modelPath, i); } } - ModelLoader.setCustomModelResourceLocation(item.getItem(), i, new ModelResourceLocation(new ResourceLocation(item.getItem().getRegistryName().getResourceDomain(), modelPath), "inventory")); + ModelLoader.setCustomModelResourceLocation(item.getItem(), i, new ModelResourceLocation(new ResourceLocation(item.getItem().getRegistryName().getNamespace(), modelPath), "inventory")); } } diff --git a/common/logisticspipes/proxy/side/ServerProxy.java b/src/main/java/logisticspipes/proxy/side/ServerProxy.java similarity index 100% rename from common/logisticspipes/proxy/side/ServerProxy.java rename to src/main/java/logisticspipes/proxy/side/ServerProxy.java diff --git a/common/logisticspipes/proxy/specialconnection/SpecialPipeConnection.java b/src/main/java/logisticspipes/proxy/specialconnection/SpecialPipeConnection.java similarity index 100% rename from common/logisticspipes/proxy/specialconnection/SpecialPipeConnection.java rename to src/main/java/logisticspipes/proxy/specialconnection/SpecialPipeConnection.java diff --git a/common/logisticspipes/proxy/specialconnection/SpecialTileConnection.java b/src/main/java/logisticspipes/proxy/specialconnection/SpecialTileConnection.java similarity index 100% rename from common/logisticspipes/proxy/specialconnection/SpecialTileConnection.java rename to src/main/java/logisticspipes/proxy/specialconnection/SpecialTileConnection.java diff --git a/src/main/java/logisticspipes/proxy/specialconnection/TeleportPipes.java b/src/main/java/logisticspipes/proxy/specialconnection/TeleportPipes.java new file mode 100644 index 0000000000..e69de29bb2 diff --git a/common/logisticspipes/proxy/specialinventoryhandler/AEInterfaceInventoryHandler.java b/src/main/java/logisticspipes/proxy/specialinventoryhandler/AEInterfaceInventoryHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialinventoryhandler/AEInterfaceInventoryHandler.java rename to src/main/java/logisticspipes/proxy/specialinventoryhandler/AEInterfaceInventoryHandler.java diff --git a/common/logisticspipes/proxy/specialinventoryhandler/BuildCraftTransactorHandler.java b/src/main/java/logisticspipes/proxy/specialinventoryhandler/BuildCraftTransactorHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialinventoryhandler/BuildCraftTransactorHandler.java rename to src/main/java/logisticspipes/proxy/specialinventoryhandler/BuildCraftTransactorHandler.java diff --git a/common/logisticspipes/proxy/specialinventoryhandler/SpecialInventoryHandler.java b/src/main/java/logisticspipes/proxy/specialinventoryhandler/SpecialInventoryHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialinventoryhandler/SpecialInventoryHandler.java rename to src/main/java/logisticspipes/proxy/specialinventoryhandler/SpecialInventoryHandler.java diff --git a/common/logisticspipes/proxy/specialtankhandler/AETankHandler.java b/src/main/java/logisticspipes/proxy/specialtankhandler/AETankHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialtankhandler/AETankHandler.java rename to src/main/java/logisticspipes/proxy/specialtankhandler/AETankHandler.java diff --git a/common/logisticspipes/proxy/specialtankhandler/BuildCraftTankHandler.java b/src/main/java/logisticspipes/proxy/specialtankhandler/BuildCraftTankHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialtankhandler/BuildCraftTankHandler.java rename to src/main/java/logisticspipes/proxy/specialtankhandler/BuildCraftTankHandler.java diff --git a/common/logisticspipes/proxy/specialtankhandler/SpecialTankHandler.java b/src/main/java/logisticspipes/proxy/specialtankhandler/SpecialTankHandler.java similarity index 100% rename from common/logisticspipes/proxy/specialtankhandler/SpecialTankHandler.java rename to src/main/java/logisticspipes/proxy/specialtankhandler/SpecialTankHandler.java diff --git a/common/logisticspipes/proxy/td/LPDuctUnitItem.java b/src/main/java/logisticspipes/proxy/td/LPDuctUnitItem.java similarity index 94% rename from common/logisticspipes/proxy/td/LPDuctUnitItem.java rename to src/main/java/logisticspipes/proxy/td/LPDuctUnitItem.java index 82fefb3289..6c1b63e63b 100644 --- a/common/logisticspipes/proxy/td/LPDuctUnitItem.java +++ b/src/main/java/logisticspipes/proxy/td/LPDuctUnitItem.java @@ -41,7 +41,7 @@ public LPDuctUnitItem(TileGrid parent, Duct duct, LogisticsTileGenericPipe pipe) } public boolean isLPBlockedSide(int paramInt, boolean ignoreSystemDisconnect) { - EnumFacing dir = EnumFacing.getFront(paramInt); + EnumFacing dir = EnumFacing.byIndex(paramInt); AxisAlignedBB aabb = PIPE_CONN_BB.get(paramInt); if (SimpleServiceLocator.mcmpProxy.checkIntersectionWith(pipe, aabb)) { @@ -109,9 +109,9 @@ public void transferItem(TravelingItem item) { info.setItem(ItemIdentifierStack.getFromStack(item.stack)); LPTravelingItem.LPTravelingItemServer lpItem = new LPTravelingItem.LPTravelingItemServer(info); lpItem.setSpeed(info._transportMode == IRoutedItem.TransportMode.Active ? 0.3F : 0.2F); - pipe.pipe.transport.injectItem(lpItem, EnumFacing.getFront(item.direction).getOpposite()); + pipe.pipe.transport.injectItem(lpItem, EnumFacing.byIndex(item.direction).getOpposite()); } else if (item.stack != null) { - int consumed = pipe.injectItem(item.stack, true, EnumFacing.getFront(item.direction).getOpposite()); + int consumed = pipe.injectItem(item.stack, true, EnumFacing.byIndex(item.direction).getOpposite()); item.stack.shrink(consumed); if (item.stack.getCount() > 0) { pipe.pipe.transport._itemBuffer.add(new Triplet<>(ItemIdentifierStack diff --git a/common/logisticspipes/proxy/td/TDDuctInformationProvider.java b/src/main/java/logisticspipes/proxy/td/TDDuctInformationProvider.java similarity index 96% rename from common/logisticspipes/proxy/td/TDDuctInformationProvider.java rename to src/main/java/logisticspipes/proxy/td/TDDuctInformationProvider.java index 5135da08c0..d06e355447 100644 --- a/common/logisticspipes/proxy/td/TDDuctInformationProvider.java +++ b/src/main/java/logisticspipes/proxy/td/TDDuctInformationProvider.java @@ -206,7 +206,7 @@ public double getDistanceTo(int destinationint, EnumFacing ignore, ItemIdentifie visited.add(pos); double distance = lpDuct.pipe - .getDistanceTo(destinationint, EnumFacing.getFront(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)).getOpposite(), + .getDistanceTo(destinationint, EnumFacing.byIndex(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)).getOpposite(), ident, isActive, traveled + localRoute1.pathWeight, Math.min(max, closesedConnection), visited); visited.remove(pos); @@ -267,7 +267,7 @@ public boolean acceptItem(LPTravelingItem item, TileEntity from) { visited.add(pos); double distance = lpDuct.pipe - .getDistanceTo(id, EnumFacing.getFront(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)).getOpposite(), + .getDistanceTo(id, EnumFacing.byIndex(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)).getOpposite(), item.getItemIdentifierStack().getItem(), serverItem.getInfo()._transportMode == TransportMode.Active, localRoute1.pathWeight, max, visited); @@ -325,7 +325,7 @@ public List getConnectedPipes(EnumFacing from) { if (localRoute1.endPoint instanceof LPDuctUnitItem) { LPDuctUnitItem lpDuct = (LPDuctUnitItem) localRoute1.endPoint; list.add(new RouteInfo(lpDuct.pipe, localRoute1.pathWeight, - EnumFacing.getFront(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)))); + EnumFacing.byIndex(localRoute1.pathDirections.get(localRoute1.pathDirections.size() - 1)))); } } return list; diff --git a/common/logisticspipes/proxy/td/ThermalDynamicsProxy.java b/src/main/java/logisticspipes/proxy/td/ThermalDynamicsProxy.java similarity index 100% rename from common/logisticspipes/proxy/td/ThermalDynamicsProxy.java rename to src/main/java/logisticspipes/proxy/td/ThermalDynamicsProxy.java diff --git a/common/logisticspipes/proxy/td/subproxies/ITDPart.java b/src/main/java/logisticspipes/proxy/td/subproxies/ITDPart.java similarity index 100% rename from common/logisticspipes/proxy/td/subproxies/ITDPart.java rename to src/main/java/logisticspipes/proxy/td/subproxies/ITDPart.java diff --git a/common/logisticspipes/proxy/td/subproxies/TDPart.java b/src/main/java/logisticspipes/proxy/td/subproxies/TDPart.java similarity index 100% rename from common/logisticspipes/proxy/td/subproxies/TDPart.java rename to src/main/java/logisticspipes/proxy/td/subproxies/TDPart.java diff --git a/common/logisticspipes/proxy/te/ThermalExpansionProgressProvider.java b/src/main/java/logisticspipes/proxy/te/ThermalExpansionProgressProvider.java similarity index 100% rename from common/logisticspipes/proxy/te/ThermalExpansionProgressProvider.java rename to src/main/java/logisticspipes/proxy/te/ThermalExpansionProgressProvider.java diff --git a/common/logisticspipes/proxy/te/ThermalExpansionProxy.java b/src/main/java/logisticspipes/proxy/te/ThermalExpansionProxy.java similarity index 100% rename from common/logisticspipes/proxy/te/ThermalExpansionProxy.java rename to src/main/java/logisticspipes/proxy/te/ThermalExpansionProxy.java diff --git a/common/logisticspipes/recipes/CraftingPartRecipes.java b/src/main/java/logisticspipes/recipes/CraftingPartRecipes.java similarity index 100% rename from common/logisticspipes/recipes/CraftingPartRecipes.java rename to src/main/java/logisticspipes/recipes/CraftingPartRecipes.java diff --git a/common/logisticspipes/recipes/CraftingParts.java b/src/main/java/logisticspipes/recipes/CraftingParts.java similarity index 100% rename from common/logisticspipes/recipes/CraftingParts.java rename to src/main/java/logisticspipes/recipes/CraftingParts.java diff --git a/common/logisticspipes/recipes/CraftingRecipes.java b/src/main/java/logisticspipes/recipes/CraftingRecipes.java similarity index 98% rename from common/logisticspipes/recipes/CraftingRecipes.java rename to src/main/java/logisticspipes/recipes/CraftingRecipes.java index bb4ee60f1c..830620a21a 100644 --- a/common/logisticspipes/recipes/CraftingRecipes.java +++ b/src/main/java/logisticspipes/recipes/CraftingRecipes.java @@ -45,7 +45,7 @@ private void registerResetRecipe(String[] dyes) { if (module == null) continue; NBTTagCompound tag = new NBTTagCompound(); module.writeToNBT(tag); - if (!tag.hasNoTags()) { + if (!tag.isEmpty()) { RecipeManager.craftingManager.addShapelessResetRecipe(item, 0); } } diff --git a/common/logisticspipes/recipes/IRecipeProvider.java b/src/main/java/logisticspipes/recipes/IRecipeProvider.java similarity index 100% rename from common/logisticspipes/recipes/IRecipeProvider.java rename to src/main/java/logisticspipes/recipes/IRecipeProvider.java diff --git a/common/logisticspipes/recipes/LPChipRecipes.java b/src/main/java/logisticspipes/recipes/LPChipRecipes.java similarity index 100% rename from common/logisticspipes/recipes/LPChipRecipes.java rename to src/main/java/logisticspipes/recipes/LPChipRecipes.java diff --git a/common/logisticspipes/recipes/ModuleChippedCraftingRecipes.java b/src/main/java/logisticspipes/recipes/ModuleChippedCraftingRecipes.java similarity index 100% rename from common/logisticspipes/recipes/ModuleChippedCraftingRecipes.java rename to src/main/java/logisticspipes/recipes/ModuleChippedCraftingRecipes.java diff --git a/common/logisticspipes/recipes/NBTIngredient.java b/src/main/java/logisticspipes/recipes/NBTIngredient.java similarity index 100% rename from common/logisticspipes/recipes/NBTIngredient.java rename to src/main/java/logisticspipes/recipes/NBTIngredient.java diff --git a/common/logisticspipes/recipes/PipeChippedCraftingRecipes.java b/src/main/java/logisticspipes/recipes/PipeChippedCraftingRecipes.java similarity index 100% rename from common/logisticspipes/recipes/PipeChippedCraftingRecipes.java rename to src/main/java/logisticspipes/recipes/PipeChippedCraftingRecipes.java diff --git a/common/logisticspipes/recipes/RecipeManager.java b/src/main/java/logisticspipes/recipes/RecipeManager.java similarity index 97% rename from common/logisticspipes/recipes/RecipeManager.java rename to src/main/java/logisticspipes/recipes/RecipeManager.java index 42ab2c2345..49193703a9 100644 --- a/common/logisticspipes/recipes/RecipeManager.java +++ b/src/main/java/logisticspipes/recipes/RecipeManager.java @@ -167,9 +167,9 @@ private void dumpRecipe(@Nonnull ItemStack result, Object layout, RecipeIndex... String format; if (result.getHasSubtypes()) { - format = String.format("generated_recipes/%s.%d.json", result.getItem().getRegistryName().getResourcePath(), result.getItemDamage()); + format = String.format("generated_recipes/%s.%d.json", result.getItem().getRegistryName().getPath(), result.getItemDamage()); } else { - format = String.format("generated_recipes/%s.json", result.getItem().getRegistryName().getResourcePath()); + format = String.format("generated_recipes/%s.json", result.getItem().getRegistryName().getPath()); } File out = new File(format); @@ -224,12 +224,12 @@ private static ResourceLocation getFreeRecipeResourceLocation(@Nonnull ItemStack } private static ResourceLocation getFreeRecipeResourceLocation(Item item) { - ResourceLocation baseLoc = new ResourceLocation(LPConstants.LP_MOD_ID, item.getRegistryName().getResourcePath()); + ResourceLocation baseLoc = new ResourceLocation(LPConstants.LP_MOD_ID, item.getRegistryName().getPath()); ResourceLocation recipeLoc = baseLoc; int index = 0; while (CraftingManager.REGISTRY.containsKey(recipeLoc)) { index++; - recipeLoc = new ResourceLocation(LPConstants.LP_MOD_ID, baseLoc.getResourcePath() + "_" + index); + recipeLoc = new ResourceLocation(LPConstants.LP_MOD_ID, baseLoc.getPath() + "_" + index); } return recipeLoc; } diff --git a/common/logisticspipes/recipes/ShapelessResetRecipe.java b/src/main/java/logisticspipes/recipes/ShapelessResetRecipe.java similarity index 100% rename from common/logisticspipes/recipes/ShapelessResetRecipe.java rename to src/main/java/logisticspipes/recipes/ShapelessResetRecipe.java diff --git a/common/logisticspipes/recipes/UpgradeChippedCraftingRecipes.java b/src/main/java/logisticspipes/recipes/UpgradeChippedCraftingRecipes.java similarity index 100% rename from common/logisticspipes/recipes/UpgradeChippedCraftingRecipes.java rename to src/main/java/logisticspipes/recipes/UpgradeChippedCraftingRecipes.java diff --git a/common/logisticspipes/recipes/conditions/ConditionOreExists.java b/src/main/java/logisticspipes/recipes/conditions/ConditionOreExists.java similarity index 100% rename from common/logisticspipes/recipes/conditions/ConditionOreExists.java rename to src/main/java/logisticspipes/recipes/conditions/ConditionOreExists.java diff --git a/common/logisticspipes/recipes/ingredients/IngredientPart.java b/src/main/java/logisticspipes/recipes/ingredients/IngredientPart.java similarity index 100% rename from common/logisticspipes/recipes/ingredients/IngredientPart.java rename to src/main/java/logisticspipes/recipes/ingredients/IngredientPart.java diff --git a/common/logisticspipes/renderer/CustomBlockRenderer.java b/src/main/java/logisticspipes/renderer/CustomBlockRenderer.java similarity index 100% rename from common/logisticspipes/renderer/CustomBlockRenderer.java rename to src/main/java/logisticspipes/renderer/CustomBlockRenderer.java diff --git a/common/logisticspipes/renderer/FluidContainerRenderer.java b/src/main/java/logisticspipes/renderer/FluidContainerRenderer.java similarity index 97% rename from common/logisticspipes/renderer/FluidContainerRenderer.java rename to src/main/java/logisticspipes/renderer/FluidContainerRenderer.java index d080f1c789..3b2f931841 100644 --- a/common/logisticspipes/renderer/FluidContainerRenderer.java +++ b/src/main/java/logisticspipes/renderer/FluidContainerRenderer.java @@ -46,7 +46,7 @@ public static class FluidContainerRendererModelLoader implements ICustomModelLoa @Override public boolean accepts(@Nonnull ResourceLocation modelLocation) { - return modelLocation.getResourceDomain().equals("logisticspipes") && modelLocation.getResourcePath().equals("models/item/fluid_container"); + return modelLocation.getNamespace().equals("logisticspipes") && modelLocation.getPath().equals("models/item/fluid_container"); } @Nonnull diff --git a/common/logisticspipes/renderer/FluidRenderer.java b/src/main/java/logisticspipes/renderer/FluidRenderer.java similarity index 100% rename from common/logisticspipes/renderer/FluidRenderer.java rename to src/main/java/logisticspipes/renderer/FluidRenderer.java diff --git a/common/logisticspipes/renderer/GuiOverlay.java b/src/main/java/logisticspipes/renderer/GuiOverlay.java similarity index 100% rename from common/logisticspipes/renderer/GuiOverlay.java rename to src/main/java/logisticspipes/renderer/GuiOverlay.java diff --git a/common/logisticspipes/renderer/IIconProvider.java b/src/main/java/logisticspipes/renderer/IIconProvider.java similarity index 100% rename from common/logisticspipes/renderer/IIconProvider.java rename to src/main/java/logisticspipes/renderer/IIconProvider.java diff --git a/common/logisticspipes/renderer/LogisticsHUDRenderer.java b/src/main/java/logisticspipes/renderer/LogisticsHUDRenderer.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsHUDRenderer.java rename to src/main/java/logisticspipes/renderer/LogisticsHUDRenderer.java diff --git a/common/logisticspipes/renderer/LogisticsPipeItemRenderer.java b/src/main/java/logisticspipes/renderer/LogisticsPipeItemRenderer.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsPipeItemRenderer.java rename to src/main/java/logisticspipes/renderer/LogisticsPipeItemRenderer.java diff --git a/common/logisticspipes/renderer/LogisticsPipeWorldRenderer.java b/src/main/java/logisticspipes/renderer/LogisticsPipeWorldRenderer.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsPipeWorldRenderer.java rename to src/main/java/logisticspipes/renderer/LogisticsPipeWorldRenderer.java diff --git a/common/logisticspipes/renderer/LogisticsRenderPipe.java b/src/main/java/logisticspipes/renderer/LogisticsRenderPipe.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsRenderPipe.java rename to src/main/java/logisticspipes/renderer/LogisticsRenderPipe.java diff --git a/common/logisticspipes/renderer/LogisticsSolidBlockWorldRenderer.java b/src/main/java/logisticspipes/renderer/LogisticsSolidBlockWorldRenderer.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsSolidBlockWorldRenderer.java rename to src/main/java/logisticspipes/renderer/LogisticsSolidBlockWorldRenderer.java diff --git a/common/logisticspipes/renderer/LogisticsTileRenderController.java b/src/main/java/logisticspipes/renderer/LogisticsTileRenderController.java similarity index 100% rename from common/logisticspipes/renderer/LogisticsTileRenderController.java rename to src/main/java/logisticspipes/renderer/LogisticsTileRenderController.java diff --git a/common/logisticspipes/renderer/newpipe/GLRenderList.java b/src/main/java/logisticspipes/renderer/newpipe/GLRenderList.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/GLRenderList.java rename to src/main/java/logisticspipes/renderer/newpipe/GLRenderList.java diff --git a/common/logisticspipes/renderer/newpipe/GLRenderListHandler.java b/src/main/java/logisticspipes/renderer/newpipe/GLRenderListHandler.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/GLRenderListHandler.java rename to src/main/java/logisticspipes/renderer/newpipe/GLRenderListHandler.java diff --git a/common/logisticspipes/renderer/newpipe/IHighlightPlacementRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/IHighlightPlacementRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/IHighlightPlacementRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/IHighlightPlacementRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/ISpecialPipeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/ISpecialPipeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/ISpecialPipeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/ISpecialPipeRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/LogisticsBlockModel.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsBlockModel.java similarity index 96% rename from common/logisticspipes/renderer/newpipe/LogisticsBlockModel.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsBlockModel.java index f652fe0597..a5829e4a5e 100644 --- a/common/logisticspipes/renderer/newpipe/LogisticsBlockModel.java +++ b/src/main/java/logisticspipes/renderer/newpipe/LogisticsBlockModel.java @@ -53,14 +53,14 @@ public boolean accepts(@Nonnull ResourceLocation modelLocation) { @Override @Nonnull public IModel loadModel(@Nonnull ResourceLocation modelLocation) { - ResourceLocation baseTex = new ResourceLocation(modelLocation.getResourceDomain(), "solid_block/" + modelLocation.getResourcePath()); + ResourceLocation baseTex = new ResourceLocation(modelLocation.getNamespace(), "solid_block/" + modelLocation.getPath()); return new LogisticsBlockModel(baseTex, Objects.requireNonNull(getType(modelLocation))); } @Nullable private Type getType(ResourceLocation modelLocation) { if (!(modelLocation instanceof ModelResourceLocation)) return null; - ResourceLocation clean = new ResourceLocation(modelLocation.getResourceDomain(), modelLocation.getResourcePath()); + ResourceLocation clean = new ResourceLocation(modelLocation.getNamespace(), modelLocation.getPath()); String variant = ((ModelResourceLocation) modelLocation).getVariant(); if (variant.equals("inventory")) { @@ -87,7 +87,7 @@ public void onResourceManagerReload(@Nonnull IResourceManager resourceManager) { public LogisticsBlockModel(ResourceLocation texture, Type type) { this.inactive = texture; if (type.isHasActiveTexture()) { - this.active = new ResourceLocation(texture.getResourceDomain(), texture.getResourcePath() + "_active"); + this.active = new ResourceLocation(texture.getNamespace(), texture.getPath() + "_active"); } else { this.active = texture; } diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewPipeItemBoxRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemBoxRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/LogisticsNewPipeItemBoxRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemBoxRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeItemRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java similarity index 99% rename from common/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java index 7c1033e02a..5db68a1786 100644 --- a/common/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java +++ b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeModel.java @@ -78,9 +78,9 @@ public static class LogisticsNewPipeModelLoader implements ICustomModelLoader { @Override public boolean accepts(ResourceLocation modelLocation) { - if (modelLocation.getResourceDomain().equals("logisticspipes")) { + if (modelLocation.getNamespace().equals("logisticspipes")) { if (modelLocation instanceof ModelResourceLocation) { - ResourceLocation rl = new ResourceLocation(modelLocation.getResourceDomain(), modelLocation.getResourcePath()); + ResourceLocation rl = new ResourceLocation(modelLocation.getNamespace(), modelLocation.getPath()); if (((ModelResourceLocation) modelLocation).getVariant().equals("inventory")) { Item item = ForgeRegistries.ITEMS.getValue(rl); if (item instanceof ItemLogisticsPipe) { diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewPipeWorldRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeWorldRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/LogisticsNewPipeWorldRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewPipeWorldRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java similarity index 99% rename from common/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java index c344b8d65e..25871ecfbe 100644 --- a/common/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java +++ b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewRenderPipe.java @@ -834,7 +834,7 @@ private static void fillObjectsToRenderList(List objectsToRender, L .forEach(objectsToRender::add); for (int i = 0; i < 6; i += 2) { - EnumFacing dir = EnumFacing.getFront(i); + EnumFacing dir = EnumFacing.byIndex(i); List list = new ArrayList<>(Arrays.asList(EnumFacing.VALUES)); list.remove(dir); list.remove(dir.getOpposite()); @@ -1053,7 +1053,7 @@ private static void removeIfHasConnectedSide(List mountCanidates) { sides[mount.dir.ordinal()] = true; } for (int i = 2; i < 6; i++) { - EnumFacing dir = EnumFacing.getFront(i); + EnumFacing dir = EnumFacing.byIndex(i); EnumFacing rot = dir.rotateY(); if (sides[dir.ordinal()] && sides[rot.ordinal()]) { reduceToOnePerSide(mountCanidates, dir, dir.rotateYCCW()); diff --git a/common/logisticspipes/renderer/newpipe/LogisticsNewSolidBlockWorldRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/LogisticsNewSolidBlockWorldRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/LogisticsNewSolidBlockWorldRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/LogisticsNewSolidBlockWorldRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/PropertyCache.java b/src/main/java/logisticspipes/renderer/newpipe/PropertyCache.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/PropertyCache.java rename to src/main/java/logisticspipes/renderer/newpipe/PropertyCache.java diff --git a/common/logisticspipes/renderer/newpipe/PropertyRenderList.java b/src/main/java/logisticspipes/renderer/newpipe/PropertyRenderList.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/PropertyRenderList.java rename to src/main/java/logisticspipes/renderer/newpipe/PropertyRenderList.java diff --git a/common/logisticspipes/renderer/newpipe/RenderEntry.java b/src/main/java/logisticspipes/renderer/newpipe/RenderEntry.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/RenderEntry.java rename to src/main/java/logisticspipes/renderer/newpipe/RenderEntry.java diff --git a/common/logisticspipes/renderer/newpipe/tube/CurveTubeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/tube/CurveTubeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/tube/CurveTubeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/tube/CurveTubeRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/tube/GainTubeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/tube/GainTubeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/tube/GainTubeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/tube/GainTubeRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/tube/LineTubeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/tube/LineTubeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/tube/LineTubeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/tube/LineTubeRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/tube/SCurveTubeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/tube/SCurveTubeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/tube/SCurveTubeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/tube/SCurveTubeRenderer.java diff --git a/common/logisticspipes/renderer/newpipe/tube/SpeedupTubeRenderer.java b/src/main/java/logisticspipes/renderer/newpipe/tube/SpeedupTubeRenderer.java similarity index 100% rename from common/logisticspipes/renderer/newpipe/tube/SpeedupTubeRenderer.java rename to src/main/java/logisticspipes/renderer/newpipe/tube/SpeedupTubeRenderer.java diff --git a/common/logisticspipes/renderer/state/ConnectionMatrix.java b/src/main/java/logisticspipes/renderer/state/ConnectionMatrix.java similarity index 100% rename from common/logisticspipes/renderer/state/ConnectionMatrix.java rename to src/main/java/logisticspipes/renderer/state/ConnectionMatrix.java diff --git a/common/logisticspipes/renderer/state/PipeRenderState.java b/src/main/java/logisticspipes/renderer/state/PipeRenderState.java similarity index 100% rename from common/logisticspipes/renderer/state/PipeRenderState.java rename to src/main/java/logisticspipes/renderer/state/PipeRenderState.java diff --git a/common/logisticspipes/renderer/state/PipeSubRenderState.java b/src/main/java/logisticspipes/renderer/state/PipeSubRenderState.java similarity index 100% rename from common/logisticspipes/renderer/state/PipeSubRenderState.java rename to src/main/java/logisticspipes/renderer/state/PipeSubRenderState.java diff --git a/common/logisticspipes/renderer/state/TextureMatrix.java b/src/main/java/logisticspipes/renderer/state/TextureMatrix.java similarity index 97% rename from common/logisticspipes/renderer/state/TextureMatrix.java rename to src/main/java/logisticspipes/renderer/state/TextureMatrix.java index 56ed4a3483..2167b1feed 100644 --- a/common/logisticspipes/renderer/state/TextureMatrix.java +++ b/src/main/java/logisticspipes/renderer/state/TextureMatrix.java @@ -56,16 +56,16 @@ public void refreshStates(CoreUnroutedPipe pipe) { if (isRouted) { CoreRoutedPipe cPipe = (CoreRoutedPipe) pipe; for (int i = 0; i < 6; i++) { - if (isRoutedInDir[i] != cPipe.getRouter().isRoutedExit(EnumFacing.getFront(i))) { + if (isRoutedInDir[i] != cPipe.getRouter().isRoutedExit(EnumFacing.byIndex(i))) { dirty = true; } - isRoutedInDir[i] = cPipe.getRouter().isRoutedExit(EnumFacing.getFront(i)); + isRoutedInDir[i] = cPipe.getRouter().isRoutedExit(EnumFacing.byIndex(i)); } for (int i = 0; i < 6; i++) { - if (isSubPowerInDir[i] != cPipe.getRouter().isSubPoweredExit(EnumFacing.getFront(i))) { + if (isSubPowerInDir[i] != cPipe.getRouter().isSubPoweredExit(EnumFacing.byIndex(i))) { dirty = true; } - isSubPowerInDir[i] = cPipe.getRouter().isSubPoweredExit(EnumFacing.getFront(i)); + isSubPowerInDir[i] = cPipe.getRouter().isSubPoweredExit(EnumFacing.byIndex(i)); } if (hasPowerUpgrade != (cPipe.getUpgradeManager().hasRFPowerSupplierUpgrade() || cPipe.getUpgradeManager().getIC2PowerLevel() > 0)) { dirty = true; diff --git a/common/logisticspipes/request/DictCraftingTemplate.java b/src/main/java/logisticspipes/request/DictCraftingTemplate.java similarity index 100% rename from common/logisticspipes/request/DictCraftingTemplate.java rename to src/main/java/logisticspipes/request/DictCraftingTemplate.java diff --git a/common/logisticspipes/request/ICraftingTemplate.java b/src/main/java/logisticspipes/request/ICraftingTemplate.java similarity index 100% rename from common/logisticspipes/request/ICraftingTemplate.java rename to src/main/java/logisticspipes/request/ICraftingTemplate.java diff --git a/common/logisticspipes/request/IExtraPromise.java b/src/main/java/logisticspipes/request/IExtraPromise.java similarity index 100% rename from common/logisticspipes/request/IExtraPromise.java rename to src/main/java/logisticspipes/request/IExtraPromise.java diff --git a/common/logisticspipes/request/IPromise.java b/src/main/java/logisticspipes/request/IPromise.java similarity index 100% rename from common/logisticspipes/request/IPromise.java rename to src/main/java/logisticspipes/request/IPromise.java diff --git a/common/logisticspipes/request/IReqCraftingTemplate.java b/src/main/java/logisticspipes/request/IReqCraftingTemplate.java similarity index 100% rename from common/logisticspipes/request/IReqCraftingTemplate.java rename to src/main/java/logisticspipes/request/IReqCraftingTemplate.java diff --git a/common/logisticspipes/request/ItemCraftingTemplate.java b/src/main/java/logisticspipes/request/ItemCraftingTemplate.java similarity index 100% rename from common/logisticspipes/request/ItemCraftingTemplate.java rename to src/main/java/logisticspipes/request/ItemCraftingTemplate.java diff --git a/common/logisticspipes/request/RequestHandler.java b/src/main/java/logisticspipes/request/RequestHandler.java similarity index 100% rename from common/logisticspipes/request/RequestHandler.java rename to src/main/java/logisticspipes/request/RequestHandler.java diff --git a/common/logisticspipes/request/RequestLog.java b/src/main/java/logisticspipes/request/RequestLog.java similarity index 100% rename from common/logisticspipes/request/RequestLog.java rename to src/main/java/logisticspipes/request/RequestLog.java diff --git a/common/logisticspipes/request/RequestTree.java b/src/main/java/logisticspipes/request/RequestTree.java similarity index 100% rename from common/logisticspipes/request/RequestTree.java rename to src/main/java/logisticspipes/request/RequestTree.java diff --git a/common/logisticspipes/request/RequestTreeNode.java b/src/main/java/logisticspipes/request/RequestTreeNode.java similarity index 100% rename from common/logisticspipes/request/RequestTreeNode.java rename to src/main/java/logisticspipes/request/RequestTreeNode.java diff --git a/common/logisticspipes/request/resources/DictResource.java b/src/main/java/logisticspipes/request/resources/DictResource.java similarity index 100% rename from common/logisticspipes/request/resources/DictResource.java rename to src/main/java/logisticspipes/request/resources/DictResource.java diff --git a/common/logisticspipes/request/resources/FluidResource.java b/src/main/java/logisticspipes/request/resources/FluidResource.java similarity index 100% rename from common/logisticspipes/request/resources/FluidResource.java rename to src/main/java/logisticspipes/request/resources/FluidResource.java diff --git a/common/logisticspipes/request/resources/IResource.java b/src/main/java/logisticspipes/request/resources/IResource.java similarity index 100% rename from common/logisticspipes/request/resources/IResource.java rename to src/main/java/logisticspipes/request/resources/IResource.java diff --git a/common/logisticspipes/request/resources/ItemResource.java b/src/main/java/logisticspipes/request/resources/ItemResource.java similarity index 100% rename from common/logisticspipes/request/resources/ItemResource.java rename to src/main/java/logisticspipes/request/resources/ItemResource.java diff --git a/common/logisticspipes/request/resources/ResourceNetwork.java b/src/main/java/logisticspipes/request/resources/ResourceNetwork.java similarity index 100% rename from common/logisticspipes/request/resources/ResourceNetwork.java rename to src/main/java/logisticspipes/request/resources/ResourceNetwork.java diff --git a/common/logisticspipes/routing/ClientRouter.java b/src/main/java/logisticspipes/routing/ClientRouter.java similarity index 100% rename from common/logisticspipes/routing/ClientRouter.java rename to src/main/java/logisticspipes/routing/ClientRouter.java diff --git a/common/logisticspipes/routing/DummyRoutingDebugAdapter.java b/src/main/java/logisticspipes/routing/DummyRoutingDebugAdapter.java similarity index 100% rename from common/logisticspipes/routing/DummyRoutingDebugAdapter.java rename to src/main/java/logisticspipes/routing/DummyRoutingDebugAdapter.java diff --git a/common/logisticspipes/routing/ExitRoute.java b/src/main/java/logisticspipes/routing/ExitRoute.java similarity index 100% rename from common/logisticspipes/routing/ExitRoute.java rename to src/main/java/logisticspipes/routing/ExitRoute.java diff --git a/common/logisticspipes/routing/FluidLogisticsPromise.java b/src/main/java/logisticspipes/routing/FluidLogisticsPromise.java similarity index 100% rename from common/logisticspipes/routing/FluidLogisticsPromise.java rename to src/main/java/logisticspipes/routing/FluidLogisticsPromise.java diff --git a/common/logisticspipes/routing/IPaintPath.java b/src/main/java/logisticspipes/routing/IPaintPath.java similarity index 100% rename from common/logisticspipes/routing/IPaintPath.java rename to src/main/java/logisticspipes/routing/IPaintPath.java diff --git a/common/logisticspipes/routing/IRouter.java b/src/main/java/logisticspipes/routing/IRouter.java similarity index 100% rename from common/logisticspipes/routing/IRouter.java rename to src/main/java/logisticspipes/routing/IRouter.java diff --git a/common/logisticspipes/routing/IRouterQueuedTask.java b/src/main/java/logisticspipes/routing/IRouterQueuedTask.java similarity index 100% rename from common/logisticspipes/routing/IRouterQueuedTask.java rename to src/main/java/logisticspipes/routing/IRouterQueuedTask.java diff --git a/common/logisticspipes/routing/ItemRoutingInformation.java b/src/main/java/logisticspipes/routing/ItemRoutingInformation.java similarity index 92% rename from common/logisticspipes/routing/ItemRoutingInformation.java rename to src/main/java/logisticspipes/routing/ItemRoutingInformation.java index 807bae585c..7b0f6fc04b 100644 --- a/common/logisticspipes/routing/ItemRoutingInformation.java +++ b/src/main/java/logisticspipes/routing/ItemRoutingInformation.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.UUID; +import logisticspipes.utils.FastUUID; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -64,7 +66,7 @@ public ItemRoutingInformation clone() { public void readFromNBT(NBTTagCompound nbttagcompound) { if (nbttagcompound.hasKey("destinationUUID")) { - destinationUUID = UUID.fromString(nbttagcompound.getString("destinationUUID")); + destinationUUID = FastUUID.parseUUID(nbttagcompound.getString("destinationUUID")); } arrived = nbttagcompound.getBoolean("arrived"); bufferCounter = nbttagcompound.getInteger("bufferCounter"); @@ -75,7 +77,7 @@ public void readFromNBT(NBTTagCompound nbttagcompound) { public void writeToNBT(NBTTagCompound nbttagcompound) { if (destinationUUID != null) { - nbttagcompound.setString("destinationUUID", destinationUUID.toString()); + nbttagcompound.setString("destinationUUID", FastUUID.toString(destinationUUID)); } nbttagcompound.setBoolean("arrived", arrived); nbttagcompound.setInteger("bufferCounter", bufferCounter); @@ -117,14 +119,14 @@ public String toString() { public void storeToNBT(NBTTagCompound nbtTagCompound) { UUID uuid = UUID.randomUUID(); - nbtTagCompound.setString("StoreUUID", uuid.toString()); + nbtTagCompound.setString("StoreUUID", FastUUID.toString(uuid)); this.writeToNBT(nbtTagCompound); storeMap.put(uuid, this); } public static ItemRoutingInformation restoreFromNBT(NBTTagCompound nbtTagCompound) { if (nbtTagCompound.hasKey("StoreUUID")) { - UUID uuid = UUID.fromString(nbtTagCompound.getString("StoreUUID")); + UUID uuid = FastUUID.parseUUID(nbtTagCompound.getString("StoreUUID")); if (storeMap.containsKey(uuid)) { ItemRoutingInformation result = storeMap.get(uuid); storeMap.remove(uuid); diff --git a/common/logisticspipes/routing/LaserData.java b/src/main/java/logisticspipes/routing/LaserData.java similarity index 100% rename from common/logisticspipes/routing/LaserData.java rename to src/main/java/logisticspipes/routing/LaserData.java diff --git a/common/logisticspipes/routing/LogisticsDictPromise.java b/src/main/java/logisticspipes/routing/LogisticsDictPromise.java similarity index 100% rename from common/logisticspipes/routing/LogisticsDictPromise.java rename to src/main/java/logisticspipes/routing/LogisticsDictPromise.java diff --git a/common/logisticspipes/routing/LogisticsExtraDictPromise.java b/src/main/java/logisticspipes/routing/LogisticsExtraDictPromise.java similarity index 100% rename from common/logisticspipes/routing/LogisticsExtraDictPromise.java rename to src/main/java/logisticspipes/routing/LogisticsExtraDictPromise.java diff --git a/common/logisticspipes/routing/LogisticsExtraPromise.java b/src/main/java/logisticspipes/routing/LogisticsExtraPromise.java similarity index 100% rename from common/logisticspipes/routing/LogisticsExtraPromise.java rename to src/main/java/logisticspipes/routing/LogisticsExtraPromise.java diff --git a/common/logisticspipes/routing/LogisticsPromise.java b/src/main/java/logisticspipes/routing/LogisticsPromise.java similarity index 100% rename from common/logisticspipes/routing/LogisticsPromise.java rename to src/main/java/logisticspipes/routing/LogisticsPromise.java diff --git a/common/logisticspipes/routing/PipeRoutingConnectionType.java b/src/main/java/logisticspipes/routing/PipeRoutingConnectionType.java similarity index 100% rename from common/logisticspipes/routing/PipeRoutingConnectionType.java rename to src/main/java/logisticspipes/routing/PipeRoutingConnectionType.java diff --git a/common/logisticspipes/routing/RouterCost.java b/src/main/java/logisticspipes/routing/RouterCost.java similarity index 100% rename from common/logisticspipes/routing/RouterCost.java rename to src/main/java/logisticspipes/routing/RouterCost.java diff --git a/common/logisticspipes/routing/RouterManager.java b/src/main/java/logisticspipes/routing/RouterManager.java similarity index 100% rename from common/logisticspipes/routing/RouterManager.java rename to src/main/java/logisticspipes/routing/RouterManager.java diff --git a/common/logisticspipes/routing/ServerRouter.java b/src/main/java/logisticspipes/routing/ServerRouter.java similarity index 99% rename from common/logisticspipes/routing/ServerRouter.java rename to src/main/java/logisticspipes/routing/ServerRouter.java index 8d1d24126c..1c931864b0 100644 --- a/common/logisticspipes/routing/ServerRouter.java +++ b/src/main/java/logisticspipes/routing/ServerRouter.java @@ -446,7 +446,7 @@ private boolean recheckAdjacent() { if (changed) { CoreRoutedPipe pipe = getPipe(); if (pipe != null) { - pipe.getWorld().markAndNotifyBlock(pipe.getPos(), pipe.getWorld().getChunkFromBlockCoords(pipe.getPos()), pipe.getWorld().getBlockState(pipe.getPos()), pipe.getWorld().getBlockState(pipe.getPos()), 3); + pipe.getWorld().markAndNotifyBlock(pipe.getPos(), pipe.getWorld().getChunk(pipe.getPos()), pipe.getWorld().getBlockState(pipe.getPos()), pipe.getWorld().getBlockState(pipe.getPos()), 3); pipe.refreshConnectionAndRender(false); } adjacentChanged = true; diff --git a/common/logisticspipes/routing/channels/ChannelConnection.java b/src/main/java/logisticspipes/routing/channels/ChannelConnection.java similarity index 100% rename from common/logisticspipes/routing/channels/ChannelConnection.java rename to src/main/java/logisticspipes/routing/channels/ChannelConnection.java diff --git a/common/logisticspipes/routing/channels/ChannelInformation.java b/src/main/java/logisticspipes/routing/channels/ChannelInformation.java similarity index 85% rename from common/logisticspipes/routing/channels/ChannelInformation.java rename to src/main/java/logisticspipes/routing/channels/ChannelInformation.java index 7bdc93d521..14ee856b3d 100644 --- a/common/logisticspipes/routing/channels/ChannelInformation.java +++ b/src/main/java/logisticspipes/routing/channels/ChannelInformation.java @@ -2,6 +2,8 @@ import java.util.UUID; +import logisticspipes.utils.FastUUID; + import net.minecraft.nbt.NBTTagCompound; import lombok.AllArgsConstructor; @@ -31,11 +33,11 @@ public enum AccessRights { public ChannelInformation(NBTTagCompound nbt) { name = nbt.getString("name"); - channelIdentifier = UUID.fromString(nbt.getString("channelIdentifier")); + channelIdentifier = FastUUID.parseUUID(nbt.getString("channelIdentifier")); owner = PlayerIdentifier.readFromNBT(nbt, "owner"); rights = AccessRights.values()[nbt.getInteger("rights")]; if (nbt.hasKey("responsibleSecurityID")) { - responsibleSecurityID = UUID.fromString(nbt.getString("responsibleSecurityID")); + responsibleSecurityID = FastUUID.parseUUID(nbt.getString("responsibleSecurityID")); } else { responsibleSecurityID = null; } diff --git a/common/logisticspipes/routing/channels/ChannelManager.java b/src/main/java/logisticspipes/routing/channels/ChannelManager.java similarity index 100% rename from common/logisticspipes/routing/channels/ChannelManager.java rename to src/main/java/logisticspipes/routing/channels/ChannelManager.java diff --git a/common/logisticspipes/routing/channels/ChannelManagerProvider.java b/src/main/java/logisticspipes/routing/channels/ChannelManagerProvider.java similarity index 100% rename from common/logisticspipes/routing/channels/ChannelManagerProvider.java rename to src/main/java/logisticspipes/routing/channels/ChannelManagerProvider.java diff --git a/common/logisticspipes/routing/debug/ClientViewController.java b/src/main/java/logisticspipes/routing/debug/ClientViewController.java similarity index 100% rename from common/logisticspipes/routing/debug/ClientViewController.java rename to src/main/java/logisticspipes/routing/debug/ClientViewController.java diff --git a/common/logisticspipes/routing/debug/DebugController.java b/src/main/java/logisticspipes/routing/debug/DebugController.java similarity index 100% rename from common/logisticspipes/routing/debug/DebugController.java rename to src/main/java/logisticspipes/routing/debug/DebugController.java diff --git a/common/logisticspipes/routing/debug/DebugWindow.java b/src/main/java/logisticspipes/routing/debug/DebugWindow.java similarity index 100% rename from common/logisticspipes/routing/debug/DebugWindow.java rename to src/main/java/logisticspipes/routing/debug/DebugWindow.java diff --git a/common/logisticspipes/routing/debug/ExitRouteDebug.java b/src/main/java/logisticspipes/routing/debug/ExitRouteDebug.java similarity index 100% rename from common/logisticspipes/routing/debug/ExitRouteDebug.java rename to src/main/java/logisticspipes/routing/debug/ExitRouteDebug.java diff --git a/common/logisticspipes/routing/debug/HUDRoutingTableDebugProvider.java b/src/main/java/logisticspipes/routing/debug/HUDRoutingTableDebugProvider.java similarity index 100% rename from common/logisticspipes/routing/debug/HUDRoutingTableDebugProvider.java rename to src/main/java/logisticspipes/routing/debug/HUDRoutingTableDebugProvider.java diff --git a/common/logisticspipes/routing/debug/HUDRoutingTableGeneralInfo.java b/src/main/java/logisticspipes/routing/debug/HUDRoutingTableGeneralInfo.java similarity index 100% rename from common/logisticspipes/routing/debug/HUDRoutingTableGeneralInfo.java rename to src/main/java/logisticspipes/routing/debug/HUDRoutingTableGeneralInfo.java diff --git a/common/logisticspipes/routing/debug/RoutingTableDebugUpdateThread.java b/src/main/java/logisticspipes/routing/debug/RoutingTableDebugUpdateThread.java similarity index 100% rename from common/logisticspipes/routing/debug/RoutingTableDebugUpdateThread.java rename to src/main/java/logisticspipes/routing/debug/RoutingTableDebugUpdateThread.java diff --git a/common/logisticspipes/routing/order/ClientSideOrderInfo.java b/src/main/java/logisticspipes/routing/order/ClientSideOrderInfo.java similarity index 100% rename from common/logisticspipes/routing/order/ClientSideOrderInfo.java rename to src/main/java/logisticspipes/routing/order/ClientSideOrderInfo.java diff --git a/common/logisticspipes/routing/order/DistanceTracker.java b/src/main/java/logisticspipes/routing/order/DistanceTracker.java similarity index 100% rename from common/logisticspipes/routing/order/DistanceTracker.java rename to src/main/java/logisticspipes/routing/order/DistanceTracker.java diff --git a/common/logisticspipes/routing/order/IDistanceTracker.java b/src/main/java/logisticspipes/routing/order/IDistanceTracker.java similarity index 100% rename from common/logisticspipes/routing/order/IDistanceTracker.java rename to src/main/java/logisticspipes/routing/order/IDistanceTracker.java diff --git a/common/logisticspipes/routing/order/IOrderInfoProvider.java b/src/main/java/logisticspipes/routing/order/IOrderInfoProvider.java similarity index 100% rename from common/logisticspipes/routing/order/IOrderInfoProvider.java rename to src/main/java/logisticspipes/routing/order/IOrderInfoProvider.java diff --git a/common/logisticspipes/routing/order/LinkedLogisticsOrderList.java b/src/main/java/logisticspipes/routing/order/LinkedLogisticsOrderList.java similarity index 100% rename from common/logisticspipes/routing/order/LinkedLogisticsOrderList.java rename to src/main/java/logisticspipes/routing/order/LinkedLogisticsOrderList.java diff --git a/common/logisticspipes/routing/order/LogisticsFluidOrder.java b/src/main/java/logisticspipes/routing/order/LogisticsFluidOrder.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsFluidOrder.java rename to src/main/java/logisticspipes/routing/order/LogisticsFluidOrder.java diff --git a/common/logisticspipes/routing/order/LogisticsFluidOrderManager.java b/src/main/java/logisticspipes/routing/order/LogisticsFluidOrderManager.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsFluidOrderManager.java rename to src/main/java/logisticspipes/routing/order/LogisticsFluidOrderManager.java diff --git a/common/logisticspipes/routing/order/LogisticsItemOrder.java b/src/main/java/logisticspipes/routing/order/LogisticsItemOrder.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsItemOrder.java rename to src/main/java/logisticspipes/routing/order/LogisticsItemOrder.java diff --git a/common/logisticspipes/routing/order/LogisticsItemOrderManager.java b/src/main/java/logisticspipes/routing/order/LogisticsItemOrderManager.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsItemOrderManager.java rename to src/main/java/logisticspipes/routing/order/LogisticsItemOrderManager.java diff --git a/common/logisticspipes/routing/order/LogisticsOrder.java b/src/main/java/logisticspipes/routing/order/LogisticsOrder.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsOrder.java rename to src/main/java/logisticspipes/routing/order/LogisticsOrder.java diff --git a/common/logisticspipes/routing/order/LogisticsOrderLinkedList.java b/src/main/java/logisticspipes/routing/order/LogisticsOrderLinkedList.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsOrderLinkedList.java rename to src/main/java/logisticspipes/routing/order/LogisticsOrderLinkedList.java diff --git a/common/logisticspipes/routing/order/LogisticsOrderManager.java b/src/main/java/logisticspipes/routing/order/LogisticsOrderManager.java similarity index 100% rename from common/logisticspipes/routing/order/LogisticsOrderManager.java rename to src/main/java/logisticspipes/routing/order/LogisticsOrderManager.java diff --git a/common/logisticspipes/routing/pathfinder/IPipeInformationProvider.java b/src/main/java/logisticspipes/routing/pathfinder/IPipeInformationProvider.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/IPipeInformationProvider.java rename to src/main/java/logisticspipes/routing/pathfinder/IPipeInformationProvider.java diff --git a/common/logisticspipes/routing/pathfinder/IRouteProvider.java b/src/main/java/logisticspipes/routing/pathfinder/IRouteProvider.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/IRouteProvider.java rename to src/main/java/logisticspipes/routing/pathfinder/IRouteProvider.java diff --git a/common/logisticspipes/routing/pathfinder/ISubMultiBlockPipeInformationProvider.java b/src/main/java/logisticspipes/routing/pathfinder/ISubMultiBlockPipeInformationProvider.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/ISubMultiBlockPipeInformationProvider.java rename to src/main/java/logisticspipes/routing/pathfinder/ISubMultiBlockPipeInformationProvider.java diff --git a/common/logisticspipes/routing/pathfinder/PathFinder.java b/src/main/java/logisticspipes/routing/pathfinder/PathFinder.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/PathFinder.java rename to src/main/java/logisticspipes/routing/pathfinder/PathFinder.java diff --git a/common/logisticspipes/routing/pathfinder/PipeInformationManager.java b/src/main/java/logisticspipes/routing/pathfinder/PipeInformationManager.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/PipeInformationManager.java rename to src/main/java/logisticspipes/routing/pathfinder/PipeInformationManager.java diff --git a/common/logisticspipes/routing/pathfinder/changedetection/TEControl.java b/src/main/java/logisticspipes/routing/pathfinder/changedetection/TEControl.java similarity index 100% rename from common/logisticspipes/routing/pathfinder/changedetection/TEControl.java rename to src/main/java/logisticspipes/routing/pathfinder/changedetection/TEControl.java diff --git a/common/logisticspipes/security/PermissionException.java b/src/main/java/logisticspipes/security/PermissionException.java similarity index 100% rename from common/logisticspipes/security/PermissionException.java rename to src/main/java/logisticspipes/security/PermissionException.java diff --git a/common/logisticspipes/security/SecuritySettings.java b/src/main/java/logisticspipes/security/SecuritySettings.java similarity index 100% rename from common/logisticspipes/security/SecuritySettings.java rename to src/main/java/logisticspipes/security/SecuritySettings.java diff --git a/common/logisticspipes/textures/Textures.java b/src/main/java/logisticspipes/textures/Textures.java similarity index 100% rename from common/logisticspipes/textures/Textures.java rename to src/main/java/logisticspipes/textures/Textures.java diff --git a/common/logisticspipes/textures/provider/LPActionTriggerIconProvider.java b/src/main/java/logisticspipes/textures/provider/LPActionTriggerIconProvider.java similarity index 97% rename from common/logisticspipes/textures/provider/LPActionTriggerIconProvider.java rename to src/main/java/logisticspipes/textures/provider/LPActionTriggerIconProvider.java index 61eefb67a8..889f06d6cd 100644 --- a/common/logisticspipes/textures/provider/LPActionTriggerIconProvider.java +++ b/src/main/java/logisticspipes/textures/provider/LPActionTriggerIconProvider.java @@ -1,53 +1,53 @@ -package logisticspipes.textures.provider; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import logisticspipes.renderer.IIconProvider; - -public class LPActionTriggerIconProvider implements IIconProvider { - - public static int actionDisablePipeIconIndex = 0; - public static int triggerCraftingIconIndex = 1; - public static int triggerPowerDischargingIconIndex = 2; - public static int triggerPowerNeededIconIndex = 3; - public static int triggerSupplierFailedIconIndex = 4; - public static int triggerHasDestinationIconIndex = 5; - public static int actionRobotRoutingIconIndex = 6; - - @SideOnly(Side.CLIENT) - private TextureAtlasSprite[] icons; - - public LPActionTriggerIconProvider() { - if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - icons = new TextureAtlasSprite[7]; - } - } - - @Override - @SideOnly(Side.CLIENT) - public TextureAtlasSprite getIcon(int iconIndex) { - if (iconIndex > 6) { - return null; - } - return icons[iconIndex]; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(Object icon) { - TextureMap iconRegister = (TextureMap) icon; - icons[LPActionTriggerIconProvider.actionDisablePipeIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/DisablePipe")); - icons[LPActionTriggerIconProvider.triggerCraftingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/CraftingWaiting")); - icons[LPActionTriggerIconProvider.triggerPowerDischargingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/PowerDischarging")); - icons[LPActionTriggerIconProvider.triggerPowerNeededIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/PowerNeeded")); - icons[LPActionTriggerIconProvider.triggerSupplierFailedIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/ActionTrigger1")); - icons[LPActionTriggerIconProvider.triggerHasDestinationIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/ActionTrigger17")); - icons[LPActionTriggerIconProvider.actionRobotRoutingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/RobotRouting")); - } -} +package logisticspipes.textures.provider; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.ResourceLocation; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import logisticspipes.renderer.IIconProvider; + +public class LPActionTriggerIconProvider implements IIconProvider { + + public static int actionDisablePipeIconIndex = 0; + public static int triggerCraftingIconIndex = 1; + public static int triggerPowerDischargingIconIndex = 2; + public static int triggerPowerNeededIconIndex = 3; + public static int triggerSupplierFailedIconIndex = 4; + public static int triggerHasDestinationIconIndex = 5; + public static int actionRobotRoutingIconIndex = 6; + + @SideOnly(Side.CLIENT) + private TextureAtlasSprite[] icons; + + public LPActionTriggerIconProvider() { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { + icons = new TextureAtlasSprite[7]; + } + } + + @Override + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getIcon(int iconIndex) { + if (iconIndex > 6) { + return null; + } + return icons[iconIndex]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(Object icon) { + TextureMap iconRegister = (TextureMap) icon; + icons[LPActionTriggerIconProvider.actionDisablePipeIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/DisablePipe")); + icons[LPActionTriggerIconProvider.triggerCraftingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/CraftingWaiting")); + icons[LPActionTriggerIconProvider.triggerPowerDischargingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/PowerDischarging")); + icons[LPActionTriggerIconProvider.triggerPowerNeededIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/PowerNeeded")); + icons[LPActionTriggerIconProvider.triggerSupplierFailedIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/ActionTrigger1")); + icons[LPActionTriggerIconProvider.triggerHasDestinationIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/ActionTrigger17")); + icons[LPActionTriggerIconProvider.actionRobotRoutingIconIndex] = iconRegister.registerSprite(new ResourceLocation("logisticspipes:actionTriggers/RobotRouting")); + } +} diff --git a/common/logisticspipes/textures/provider/LPPipeIconProvider.java b/src/main/java/logisticspipes/textures/provider/LPPipeIconProvider.java similarity index 96% rename from common/logisticspipes/textures/provider/LPPipeIconProvider.java rename to src/main/java/logisticspipes/textures/provider/LPPipeIconProvider.java index 8f8e00cd66..3864322de2 100644 --- a/common/logisticspipes/textures/provider/LPPipeIconProvider.java +++ b/src/main/java/logisticspipes/textures/provider/LPPipeIconProvider.java @@ -1,41 +1,41 @@ -package logisticspipes.textures.provider; - -import java.util.ArrayList; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import logisticspipes.renderer.IIconProvider; - -public class LPPipeIconProvider implements IIconProvider { - - @SideOnly(Side.CLIENT) - private ArrayList icons; - - public LPPipeIconProvider() { - if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - icons = new ArrayList<>(); - } - } - - @Override - @SideOnly(Side.CLIENT) - public TextureAtlasSprite getIcon(int iconIndex) { - return icons.get(iconIndex); - } - - @SideOnly(Side.CLIENT) - public void setIcon(int index, TextureAtlasSprite icon) { - while (icons.size() < index + 1) { - icons.add(null); - } - icons.set(index, icon); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(Object iconRegister) {} -} +package logisticspipes.textures.provider; + +import java.util.ArrayList; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; + +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import logisticspipes.renderer.IIconProvider; + +public class LPPipeIconProvider implements IIconProvider { + + @SideOnly(Side.CLIENT) + private ArrayList icons; + + public LPPipeIconProvider() { + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { + icons = new ArrayList<>(); + } + } + + @Override + @SideOnly(Side.CLIENT) + public TextureAtlasSprite getIcon(int iconIndex) { + return icons.get(iconIndex); + } + + @SideOnly(Side.CLIENT) + public void setIcon(int index, TextureAtlasSprite icon) { + while (icons.size() < index + 1) { + icons.add(null); + } + icons.set(index, icon); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(Object iconRegister) {} +} diff --git a/common/logisticspipes/textures/provider/LPPipeIconTransformerProvider.java b/src/main/java/logisticspipes/textures/provider/LPPipeIconTransformerProvider.java similarity index 100% rename from common/logisticspipes/textures/provider/LPPipeIconTransformerProvider.java rename to src/main/java/logisticspipes/textures/provider/LPPipeIconTransformerProvider.java diff --git a/common/logisticspipes/ticks/ClientPacketBufferHandlerThread.java b/src/main/java/logisticspipes/ticks/ClientPacketBufferHandlerThread.java similarity index 100% rename from common/logisticspipes/ticks/ClientPacketBufferHandlerThread.java rename to src/main/java/logisticspipes/ticks/ClientPacketBufferHandlerThread.java diff --git a/common/logisticspipes/ticks/HudUpdateTick.java b/src/main/java/logisticspipes/ticks/HudUpdateTick.java similarity index 100% rename from common/logisticspipes/ticks/HudUpdateTick.java rename to src/main/java/logisticspipes/ticks/HudUpdateTick.java diff --git a/common/logisticspipes/ticks/LPTickHandler.java b/src/main/java/logisticspipes/ticks/LPTickHandler.java similarity index 100% rename from common/logisticspipes/ticks/LPTickHandler.java rename to src/main/java/logisticspipes/ticks/LPTickHandler.java diff --git a/common/logisticspipes/ticks/QueuedTasks.java b/src/main/java/logisticspipes/ticks/QueuedTasks.java similarity index 100% rename from common/logisticspipes/ticks/QueuedTasks.java rename to src/main/java/logisticspipes/ticks/QueuedTasks.java diff --git a/common/logisticspipes/ticks/RenderTickHandler.java b/src/main/java/logisticspipes/ticks/RenderTickHandler.java similarity index 100% rename from common/logisticspipes/ticks/RenderTickHandler.java rename to src/main/java/logisticspipes/ticks/RenderTickHandler.java diff --git a/common/logisticspipes/ticks/RoutingTableUpdateThread.java b/src/main/java/logisticspipes/ticks/RoutingTableUpdateThread.java similarity index 100% rename from common/logisticspipes/ticks/RoutingTableUpdateThread.java rename to src/main/java/logisticspipes/ticks/RoutingTableUpdateThread.java diff --git a/common/logisticspipes/ticks/ServerPacketBufferHandlerThread.java b/src/main/java/logisticspipes/ticks/ServerPacketBufferHandlerThread.java similarity index 100% rename from common/logisticspipes/ticks/ServerPacketBufferHandlerThread.java rename to src/main/java/logisticspipes/ticks/ServerPacketBufferHandlerThread.java diff --git a/common/logisticspipes/ticks/VersionChecker.java b/src/main/java/logisticspipes/ticks/VersionChecker.java similarity index 100% rename from common/logisticspipes/ticks/VersionChecker.java rename to src/main/java/logisticspipes/ticks/VersionChecker.java diff --git a/common/logisticspipes/transport/EntrencsTransport.java b/src/main/java/logisticspipes/transport/EntrencsTransport.java similarity index 100% rename from common/logisticspipes/transport/EntrencsTransport.java rename to src/main/java/logisticspipes/transport/EntrencsTransport.java diff --git a/common/logisticspipes/transport/LPItemList.java b/src/main/java/logisticspipes/transport/LPItemList.java similarity index 100% rename from common/logisticspipes/transport/LPItemList.java rename to src/main/java/logisticspipes/transport/LPItemList.java diff --git a/common/logisticspipes/transport/LPTravelingItem.java b/src/main/java/logisticspipes/transport/LPTravelingItem.java similarity index 100% rename from common/logisticspipes/transport/LPTravelingItem.java rename to src/main/java/logisticspipes/transport/LPTravelingItem.java diff --git a/common/logisticspipes/transport/PipeFluidTransportLogistics.java b/src/main/java/logisticspipes/transport/PipeFluidTransportLogistics.java similarity index 100% rename from common/logisticspipes/transport/PipeFluidTransportLogistics.java rename to src/main/java/logisticspipes/transport/PipeFluidTransportLogistics.java diff --git a/common/logisticspipes/transport/PipeMultiBlockTransportLogistics.java b/src/main/java/logisticspipes/transport/PipeMultiBlockTransportLogistics.java similarity index 100% rename from common/logisticspipes/transport/PipeMultiBlockTransportLogistics.java rename to src/main/java/logisticspipes/transport/PipeMultiBlockTransportLogistics.java diff --git a/common/logisticspipes/transport/PipeTransportLogistics.java b/src/main/java/logisticspipes/transport/PipeTransportLogistics.java similarity index 99% rename from common/logisticspipes/transport/PipeTransportLogistics.java rename to src/main/java/logisticspipes/transport/PipeTransportLogistics.java index 87251941ea..4fdc2ffcc4 100644 --- a/common/logisticspipes/transport/PipeTransportLogistics.java +++ b/src/main/java/logisticspipes/transport/PipeTransportLogistics.java @@ -97,7 +97,7 @@ public PipeTransportLogistics(boolean isRouted) { public void initialize() { if (MainProxy.isServer(getWorld())) { // cache chunk for marking dirty - chunk = getWorld().getChunkFromBlockCoords(container.getPos()); + chunk = getWorld().getChunk(container.getPos()); ItemBufferSyncPacket packet = PacketHandler.getPacket(ItemBufferSyncPacket.class); packet.setTilePos(container); _itemBuffer.setPacketType(packet, getWorld().provider.getDimension(), container.getX(), container.getZ()); @@ -112,7 +112,7 @@ public void markChunkModified(TileEntity tile) { if (tile instanceof LogisticsTileGenericPipe && ((LogisticsTileGenericPipe) tile).pipe != null && ((LogisticsTileGenericPipe) tile).pipe.transport != null && ((LogisticsTileGenericPipe) tile).pipe.transport.chunk != null) { ((LogisticsTileGenericPipe) tile).pipe.transport.chunk.markDirty(); } else { - getWorld().getChunkFromBlockCoords(tile.getPos()).markDirty(); + getWorld().getChunk(tile.getPos()).markDirty(); } } } diff --git a/common/logisticspipes/transport/TransportInvConnection.java b/src/main/java/logisticspipes/transport/TransportInvConnection.java similarity index 100% rename from common/logisticspipes/transport/TransportInvConnection.java rename to src/main/java/logisticspipes/transport/TransportInvConnection.java diff --git a/common/logisticspipes/utils/CacheHolder.java b/src/main/java/logisticspipes/utils/CacheHolder.java similarity index 100% rename from common/logisticspipes/utils/CacheHolder.java rename to src/main/java/logisticspipes/utils/CacheHolder.java diff --git a/common/logisticspipes/utils/CardManagementInventory.java b/src/main/java/logisticspipes/utils/CardManagementInventory.java similarity index 100% rename from common/logisticspipes/utils/CardManagementInventory.java rename to src/main/java/logisticspipes/utils/CardManagementInventory.java diff --git a/common/logisticspipes/utils/ChainAddArrayList.java b/src/main/java/logisticspipes/utils/ChainAddArrayList.java similarity index 100% rename from common/logisticspipes/utils/ChainAddArrayList.java rename to src/main/java/logisticspipes/utils/ChainAddArrayList.java diff --git a/common/logisticspipes/utils/Color.java b/src/main/java/logisticspipes/utils/Color.java similarity index 100% rename from common/logisticspipes/utils/Color.java rename to src/main/java/logisticspipes/utils/Color.java diff --git a/common/logisticspipes/utils/CraftingUtil.java b/src/main/java/logisticspipes/utils/CraftingUtil.java similarity index 100% rename from common/logisticspipes/utils/CraftingUtil.java rename to src/main/java/logisticspipes/utils/CraftingUtil.java diff --git a/common/logisticspipes/utils/DelayedGeneric.java b/src/main/java/logisticspipes/utils/DelayedGeneric.java similarity index 100% rename from common/logisticspipes/utils/DelayedGeneric.java rename to src/main/java/logisticspipes/utils/DelayedGeneric.java diff --git a/common/logisticspipes/utils/DummyWorldProvider.java b/src/main/java/logisticspipes/utils/DummyWorldProvider.java similarity index 100% rename from common/logisticspipes/utils/DummyWorldProvider.java rename to src/main/java/logisticspipes/utils/DummyWorldProvider.java diff --git a/common/logisticspipes/utils/EnumFacingUtil.java b/src/main/java/logisticspipes/utils/EnumFacingUtil.java similarity index 100% rename from common/logisticspipes/utils/EnumFacingUtil.java rename to src/main/java/logisticspipes/utils/EnumFacingUtil.java diff --git a/common/logisticspipes/utils/EqualWeakReference.java b/src/main/java/logisticspipes/utils/EqualWeakReference.java similarity index 100% rename from common/logisticspipes/utils/EqualWeakReference.java rename to src/main/java/logisticspipes/utils/EqualWeakReference.java diff --git a/src/main/java/logisticspipes/utils/FastUUID.java b/src/main/java/logisticspipes/utils/FastUUID.java new file mode 100644 index 0000000000..45cafa4d15 --- /dev/null +++ b/src/main/java/logisticspipes/utils/FastUUID.java @@ -0,0 +1,198 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2018 Jon Chambers + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package logisticspipes.utils; + +import java.util.Arrays; +import java.util.UUID; + +public class FastUUID { + + private static final int UUID_STRING_LENGTH = 36; + + private static final char[] HEX_DIGITS = + new char[] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' }; + + private static final long[] HEX_VALUES = new long[128]; + + static { + Arrays.fill(HEX_VALUES, -1); + + HEX_VALUES['0'] = 0x0; + HEX_VALUES['1'] = 0x1; + HEX_VALUES['2'] = 0x2; + HEX_VALUES['3'] = 0x3; + HEX_VALUES['4'] = 0x4; + HEX_VALUES['5'] = 0x5; + HEX_VALUES['6'] = 0x6; + HEX_VALUES['7'] = 0x7; + HEX_VALUES['8'] = 0x8; + HEX_VALUES['9'] = 0x9; + + HEX_VALUES['a'] = 0xa; + HEX_VALUES['b'] = 0xb; + HEX_VALUES['c'] = 0xc; + HEX_VALUES['d'] = 0xd; + HEX_VALUES['e'] = 0xe; + HEX_VALUES['f'] = 0xf; + + HEX_VALUES['A'] = 0xa; + HEX_VALUES['B'] = 0xb; + HEX_VALUES['C'] = 0xc; + HEX_VALUES['D'] = 0xd; + HEX_VALUES['E'] = 0xe; + HEX_VALUES['F'] = 0xf; + } + + private FastUUID() { + // A private constructor prevents callers from accidentally instantiating FastUUID objects + } + + /** + * Parses a UUID from the given character sequence. The character sequence must represent a UUID as described in + * {@link UUID#toString()}. + * + * @param uuidSequence the character sequence from which to parse a UUID + * + * @return the UUID represented by the given character sequence + * + * @throws IllegalArgumentException if the given character sequence does not conform to the string representation as + * described in {@link UUID#toString()} + */ + public static UUID parseUUID(final CharSequence uuidSequence) { + if (uuidSequence.length() != UUID_STRING_LENGTH || + uuidSequence.charAt(8) != '-' || + uuidSequence.charAt(13) != '-' || + uuidSequence.charAt(18) != '-' || + uuidSequence.charAt(23) != '-') { + + throw new IllegalArgumentException("Illegal UUID string: " + uuidSequence); + } + + long mostSignificantBits = getHexValueForChar(uuidSequence.charAt(0)) << 60; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(1)) << 56; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(2)) << 52; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(3)) << 48; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(4)) << 44; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(5)) << 40; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(6)) << 36; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(7)) << 32; + + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(9)) << 28; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(10)) << 24; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(11)) << 20; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(12)) << 16; + + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(14)) << 12; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(15)) << 8; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(16)) << 4; + mostSignificantBits |= getHexValueForChar(uuidSequence.charAt(17)); + + long leastSignificantBits = getHexValueForChar(uuidSequence.charAt(19)) << 60; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(20)) << 56; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(21)) << 52; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(22)) << 48; + + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(24)) << 44; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(25)) << 40; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(26)) << 36; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(27)) << 32; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(28)) << 28; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(29)) << 24; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(30)) << 20; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(31)) << 16; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(32)) << 12; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(33)) << 8; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(34)) << 4; + leastSignificantBits |= getHexValueForChar(uuidSequence.charAt(35)); + + return new UUID(mostSignificantBits, leastSignificantBits); + } + + /** + * Returns a string representation of the given UUID. The returned string is formatted as described in + * {@link UUID#toString()}. + * + * @param uuid the UUID to represent as a string + * + * @return a string representation of the given UUID + */ + public static String toString(final UUID uuid) { + final long mostSignificantBits = uuid.getMostSignificantBits(); + final long leastSignificantBits = uuid.getLeastSignificantBits(); + + final char[] uuidChars = new char[UUID_STRING_LENGTH]; + + uuidChars[0] = HEX_DIGITS[(int) ((mostSignificantBits & 0xf000000000000000L) >>> 60)]; + uuidChars[1] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0f00000000000000L) >>> 56)]; + uuidChars[2] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00f0000000000000L) >>> 52)]; + uuidChars[3] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000f000000000000L) >>> 48)]; + uuidChars[4] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000f00000000000L) >>> 44)]; + uuidChars[5] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000f0000000000L) >>> 40)]; + uuidChars[6] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000f000000000L) >>> 36)]; + uuidChars[7] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000f00000000L) >>> 32)]; + uuidChars[8] = '-'; + uuidChars[9] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000f0000000L) >>> 28)]; + uuidChars[10] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000000f000000L) >>> 24)]; + uuidChars[11] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000000f00000L) >>> 20)]; + uuidChars[12] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000000f0000L) >>> 16)]; + uuidChars[13] = '-'; + uuidChars[14] = HEX_DIGITS[(int) ((mostSignificantBits & 0x000000000000f000L) >>> 12)]; + uuidChars[15] = HEX_DIGITS[(int) ((mostSignificantBits & 0x0000000000000f00L) >>> 8)]; + uuidChars[16] = HEX_DIGITS[(int) ((mostSignificantBits & 0x00000000000000f0L) >>> 4)]; + uuidChars[17] = HEX_DIGITS[(int) (mostSignificantBits & 0x000000000000000fL)]; + uuidChars[18] = '-'; + uuidChars[19] = HEX_DIGITS[(int) ((leastSignificantBits & 0xf000000000000000L) >>> 60)]; + uuidChars[20] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0f00000000000000L) >>> 56)]; + uuidChars[21] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00f0000000000000L) >>> 52)]; + uuidChars[22] = HEX_DIGITS[(int) ((leastSignificantBits & 0x000f000000000000L) >>> 48)]; + uuidChars[23] = '-'; + uuidChars[24] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0000f00000000000L) >>> 44)]; + uuidChars[25] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00000f0000000000L) >>> 40)]; + uuidChars[26] = HEX_DIGITS[(int) ((leastSignificantBits & 0x000000f000000000L) >>> 36)]; + uuidChars[27] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0000000f00000000L) >>> 32)]; + uuidChars[28] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00000000f0000000L) >>> 28)]; + uuidChars[29] = HEX_DIGITS[(int) ((leastSignificantBits & 0x000000000f000000L) >>> 24)]; + uuidChars[30] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0000000000f00000L) >>> 20)]; + uuidChars[31] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00000000000f0000L) >>> 16)]; + uuidChars[32] = HEX_DIGITS[(int) ((leastSignificantBits & 0x000000000000f000L) >>> 12)]; + uuidChars[33] = HEX_DIGITS[(int) ((leastSignificantBits & 0x0000000000000f00L) >>> 8)]; + uuidChars[34] = HEX_DIGITS[(int) ((leastSignificantBits & 0x00000000000000f0L) >>> 4)]; + uuidChars[35] = HEX_DIGITS[(int) (leastSignificantBits & 0x000000000000000fL)]; + + return new String(uuidChars); + } + + static long getHexValueForChar(final char c) { + try { + if (HEX_VALUES[c] < 0) { + throw new IllegalArgumentException("Illegal hexadecimal digit: " + c); + } + } catch (final ArrayIndexOutOfBoundsException e) { + throw new IllegalArgumentException("Illegal hexadecimal digit: " + c); + } + + return HEX_VALUES[c]; + } +} diff --git a/common/logisticspipes/utils/FinalNBTTagCompound.java b/src/main/java/logisticspipes/utils/FinalNBTTagCompound.java similarity index 100% rename from common/logisticspipes/utils/FinalNBTTagCompound.java rename to src/main/java/logisticspipes/utils/FinalNBTTagCompound.java diff --git a/common/logisticspipes/utils/FinalPair.java b/src/main/java/logisticspipes/utils/FinalPair.java similarity index 100% rename from common/logisticspipes/utils/FinalPair.java rename to src/main/java/logisticspipes/utils/FinalPair.java diff --git a/common/logisticspipes/utils/FluidIdentifier.java b/src/main/java/logisticspipes/utils/FluidIdentifier.java similarity index 100% rename from common/logisticspipes/utils/FluidIdentifier.java rename to src/main/java/logisticspipes/utils/FluidIdentifier.java diff --git a/common/logisticspipes/utils/FluidIdentifierStack.java b/src/main/java/logisticspipes/utils/FluidIdentifierStack.java similarity index 100% rename from common/logisticspipes/utils/FluidIdentifierStack.java rename to src/main/java/logisticspipes/utils/FluidIdentifierStack.java diff --git a/common/logisticspipes/utils/FluidSinkReply.java b/src/main/java/logisticspipes/utils/FluidSinkReply.java similarity index 100% rename from common/logisticspipes/utils/FluidSinkReply.java rename to src/main/java/logisticspipes/utils/FluidSinkReply.java diff --git a/common/logisticspipes/utils/IHavePriority.java b/src/main/java/logisticspipes/utils/IHavePriority.java similarity index 100% rename from common/logisticspipes/utils/IHavePriority.java rename to src/main/java/logisticspipes/utils/IHavePriority.java diff --git a/common/logisticspipes/utils/IPositionRotateble.java b/src/main/java/logisticspipes/utils/IPositionRotateble.java similarity index 100% rename from common/logisticspipes/utils/IPositionRotateble.java rename to src/main/java/logisticspipes/utils/IPositionRotateble.java diff --git a/common/logisticspipes/utils/ISimpleInventoryEventHandler.java b/src/main/java/logisticspipes/utils/ISimpleInventoryEventHandler.java similarity index 100% rename from common/logisticspipes/utils/ISimpleInventoryEventHandler.java rename to src/main/java/logisticspipes/utils/ISimpleInventoryEventHandler.java diff --git a/common/logisticspipes/utils/InventoryHelper.java b/src/main/java/logisticspipes/utils/InventoryHelper.java similarity index 100% rename from common/logisticspipes/utils/InventoryHelper.java rename to src/main/java/logisticspipes/utils/InventoryHelper.java diff --git a/common/logisticspipes/utils/InventoryUtil.java b/src/main/java/logisticspipes/utils/InventoryUtil.java similarity index 100% rename from common/logisticspipes/utils/InventoryUtil.java rename to src/main/java/logisticspipes/utils/InventoryUtil.java diff --git a/common/logisticspipes/utils/InventoryUtilFactory.java b/src/main/java/logisticspipes/utils/InventoryUtilFactory.java similarity index 100% rename from common/logisticspipes/utils/InventoryUtilFactory.java rename to src/main/java/logisticspipes/utils/InventoryUtilFactory.java diff --git a/common/logisticspipes/utils/LPPositionSet.java b/src/main/java/logisticspipes/utils/LPPositionSet.java similarity index 100% rename from common/logisticspipes/utils/LPPositionSet.java rename to src/main/java/logisticspipes/utils/LPPositionSet.java diff --git a/common/logisticspipes/utils/MinecraftColor.java b/src/main/java/logisticspipes/utils/MinecraftColor.java similarity index 100% rename from common/logisticspipes/utils/MinecraftColor.java rename to src/main/java/logisticspipes/utils/MinecraftColor.java diff --git a/common/logisticspipes/utils/ModStatusHelper.java b/src/main/java/logisticspipes/utils/ModStatusHelper.java similarity index 100% rename from common/logisticspipes/utils/ModStatusHelper.java rename to src/main/java/logisticspipes/utils/ModStatusHelper.java diff --git a/common/logisticspipes/utils/OneList.java b/src/main/java/logisticspipes/utils/OneList.java similarity index 100% rename from common/logisticspipes/utils/OneList.java rename to src/main/java/logisticspipes/utils/OneList.java diff --git a/common/logisticspipes/utils/OrientationsUtil.java b/src/main/java/logisticspipes/utils/OrientationsUtil.java similarity index 100% rename from common/logisticspipes/utils/OrientationsUtil.java rename to src/main/java/logisticspipes/utils/OrientationsUtil.java diff --git a/common/logisticspipes/utils/PlayerCollectionList.java b/src/main/java/logisticspipes/utils/PlayerCollectionList.java similarity index 100% rename from common/logisticspipes/utils/PlayerCollectionList.java rename to src/main/java/logisticspipes/utils/PlayerCollectionList.java diff --git a/common/logisticspipes/utils/PlayerIdentifier.java b/src/main/java/logisticspipes/utils/PlayerIdentifier.java similarity index 98% rename from common/logisticspipes/utils/PlayerIdentifier.java rename to src/main/java/logisticspipes/utils/PlayerIdentifier.java index 0e17cdf360..01f7be7949 100644 --- a/common/logisticspipes/utils/PlayerIdentifier.java +++ b/src/main/java/logisticspipes/utils/PlayerIdentifier.java @@ -67,7 +67,7 @@ public static PlayerIdentifier readFromNBT(NBTTagCompound nbt, String prefix) { if (nbt.hasKey(prefix + "_id")) { String tmp = nbt.getString(prefix + "_id"); try { - id = UUID.fromString(tmp); + id = FastUUID.parseUUID(tmp); } catch (Exception ignored) {} } String username = nbt.getString(prefix + "_name"); diff --git a/common/logisticspipes/utils/QuickSortChestMarkerStorage.java b/src/main/java/logisticspipes/utils/QuickSortChestMarkerStorage.java similarity index 100% rename from common/logisticspipes/utils/QuickSortChestMarkerStorage.java rename to src/main/java/logisticspipes/utils/QuickSortChestMarkerStorage.java diff --git a/common/logisticspipes/utils/ReflectionHelper.java b/src/main/java/logisticspipes/utils/ReflectionHelper.java similarity index 100% rename from common/logisticspipes/utils/ReflectionHelper.java rename to src/main/java/logisticspipes/utils/ReflectionHelper.java diff --git a/common/logisticspipes/utils/RoutedItemHelper.java b/src/main/java/logisticspipes/utils/RoutedItemHelper.java similarity index 100% rename from common/logisticspipes/utils/RoutedItemHelper.java rename to src/main/java/logisticspipes/utils/RoutedItemHelper.java diff --git a/common/logisticspipes/utils/SafeTimeTracker.java b/src/main/java/logisticspipes/utils/SafeTimeTracker.java similarity index 100% rename from common/logisticspipes/utils/SafeTimeTracker.java rename to src/main/java/logisticspipes/utils/SafeTimeTracker.java diff --git a/common/logisticspipes/utils/SinkReply.java b/src/main/java/logisticspipes/utils/SinkReply.java similarity index 100% rename from common/logisticspipes/utils/SinkReply.java rename to src/main/java/logisticspipes/utils/SinkReply.java diff --git a/common/logisticspipes/utils/SlidingWindowBitSet.java b/src/main/java/logisticspipes/utils/SlidingWindowBitSet.java similarity index 100% rename from common/logisticspipes/utils/SlidingWindowBitSet.java rename to src/main/java/logisticspipes/utils/SlidingWindowBitSet.java diff --git a/common/logisticspipes/utils/SpecialTankUtil.java b/src/main/java/logisticspipes/utils/SpecialTankUtil.java similarity index 100% rename from common/logisticspipes/utils/SpecialTankUtil.java rename to src/main/java/logisticspipes/utils/SpecialTankUtil.java diff --git a/common/logisticspipes/utils/StackTraceUtil.java b/src/main/java/logisticspipes/utils/StackTraceUtil.java similarity index 100% rename from common/logisticspipes/utils/StackTraceUtil.java rename to src/main/java/logisticspipes/utils/StackTraceUtil.java diff --git a/common/logisticspipes/utils/StaticResolve.java b/src/main/java/logisticspipes/utils/StaticResolve.java similarity index 100% rename from common/logisticspipes/utils/StaticResolve.java rename to src/main/java/logisticspipes/utils/StaticResolve.java diff --git a/common/logisticspipes/utils/StaticResolverUtil.java b/src/main/java/logisticspipes/utils/StaticResolverUtil.java similarity index 100% rename from common/logisticspipes/utils/StaticResolverUtil.java rename to src/main/java/logisticspipes/utils/StaticResolverUtil.java diff --git a/common/logisticspipes/utils/StreamHelper.java b/src/main/java/logisticspipes/utils/StreamHelper.java similarity index 100% rename from common/logisticspipes/utils/StreamHelper.java rename to src/main/java/logisticspipes/utils/StreamHelper.java diff --git a/common/logisticspipes/utils/SyncList.java b/src/main/java/logisticspipes/utils/SyncList.java similarity index 100% rename from common/logisticspipes/utils/SyncList.java rename to src/main/java/logisticspipes/utils/SyncList.java diff --git a/common/logisticspipes/utils/TankUtil.java b/src/main/java/logisticspipes/utils/TankUtil.java similarity index 100% rename from common/logisticspipes/utils/TankUtil.java rename to src/main/java/logisticspipes/utils/TankUtil.java diff --git a/common/logisticspipes/utils/TileBuffer.java b/src/main/java/logisticspipes/utils/TileBuffer.java similarity index 91% rename from common/logisticspipes/utils/TileBuffer.java rename to src/main/java/logisticspipes/utils/TileBuffer.java index 8c7b9b7f07..8cacb3464f 100644 --- a/common/logisticspipes/utils/TileBuffer.java +++ b/src/main/java/logisticspipes/utils/TileBuffer.java @@ -93,8 +93,8 @@ public static TileBuffer[] makeBuffer(World world, BlockPos pos, boolean loadUnl TileBuffer[] buffer = new TileBuffer[6]; for (int i = 0; i < 6; i++) { - EnumFacing d = EnumFacing.getFront(i); - buffer[i] = new TileBuffer(world, pos.getX() + d.getFrontOffsetX(), pos.getY() + d.getFrontOffsetY(), pos.getZ() + d.getFrontOffsetZ(), loadUnloaded); + EnumFacing d = EnumFacing.byIndex(i); + buffer[i] = new TileBuffer(world, pos.getX() + d.getXOffset(), pos.getY() + d.getYOffset(), pos.getZ() + d.getZOffset(), loadUnloaded); } return buffer; diff --git a/common/logisticspipes/utils/gui/ColorSlot.java b/src/main/java/logisticspipes/utils/gui/ColorSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/ColorSlot.java rename to src/main/java/logisticspipes/utils/gui/ColorSlot.java diff --git a/common/logisticspipes/utils/gui/DummyContainer.java b/src/main/java/logisticspipes/utils/gui/DummyContainer.java similarity index 100% rename from common/logisticspipes/utils/gui/DummyContainer.java rename to src/main/java/logisticspipes/utils/gui/DummyContainer.java diff --git a/common/logisticspipes/utils/gui/DummyModuleContainer.java b/src/main/java/logisticspipes/utils/gui/DummyModuleContainer.java similarity index 100% rename from common/logisticspipes/utils/gui/DummyModuleContainer.java rename to src/main/java/logisticspipes/utils/gui/DummyModuleContainer.java diff --git a/common/logisticspipes/utils/gui/DummySlot.java b/src/main/java/logisticspipes/utils/gui/DummySlot.java similarity index 100% rename from common/logisticspipes/utils/gui/DummySlot.java rename to src/main/java/logisticspipes/utils/gui/DummySlot.java diff --git a/common/logisticspipes/utils/gui/FluidSlot.java b/src/main/java/logisticspipes/utils/gui/FluidSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/FluidSlot.java rename to src/main/java/logisticspipes/utils/gui/FluidSlot.java diff --git a/common/logisticspipes/utils/gui/FuzzyDummySlot.java b/src/main/java/logisticspipes/utils/gui/FuzzyDummySlot.java similarity index 100% rename from common/logisticspipes/utils/gui/FuzzyDummySlot.java rename to src/main/java/logisticspipes/utils/gui/FuzzyDummySlot.java diff --git a/common/logisticspipes/utils/gui/FuzzyUnmodifiableSlot.java b/src/main/java/logisticspipes/utils/gui/FuzzyUnmodifiableSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/FuzzyUnmodifiableSlot.java rename to src/main/java/logisticspipes/utils/gui/FuzzyUnmodifiableSlot.java diff --git a/common/logisticspipes/utils/gui/GuiCheckBox.java b/src/main/java/logisticspipes/utils/gui/GuiCheckBox.java similarity index 100% rename from common/logisticspipes/utils/gui/GuiCheckBox.java rename to src/main/java/logisticspipes/utils/gui/GuiCheckBox.java diff --git a/common/logisticspipes/utils/gui/GuiGraphics.java b/src/main/java/logisticspipes/utils/gui/GuiGraphics.java similarity index 99% rename from common/logisticspipes/utils/gui/GuiGraphics.java rename to src/main/java/logisticspipes/utils/gui/GuiGraphics.java index 6636c1895d..9e8a1eb32f 100644 --- a/common/logisticspipes/utils/gui/GuiGraphics.java +++ b/src/main/java/logisticspipes/utils/gui/GuiGraphics.java @@ -114,8 +114,8 @@ public static void displayItemToolTip(Object[] tooltip, float pzLevel, int guiLe int x = (Integer) tooltip[0] - (forceAdd ? 0 : guiLeft) + 12; int y = (Integer) tooltip[1] - (forceAdd ? 0 : guiTop) - 12; - if (!SimpleServiceLocator.neiProxy.renderItemToolTip(x, y, tooltipLines, stack.getRarity().rarityColor, stack)) { - GuiGraphics.drawToolTip(x, y, tooltipLines, stack.getRarity().rarityColor); + if (!SimpleServiceLocator.neiProxy.renderItemToolTip(x, y, tooltipLines, stack.getRarity().color, stack)) { + GuiGraphics.drawToolTip(x, y, tooltipLines, stack.getRarity().color); } GuiGraphics.zLevel = 0; diff --git a/common/logisticspipes/utils/gui/GuiStringHandlerButton.java b/src/main/java/logisticspipes/utils/gui/GuiStringHandlerButton.java similarity index 100% rename from common/logisticspipes/utils/gui/GuiStringHandlerButton.java rename to src/main/java/logisticspipes/utils/gui/GuiStringHandlerButton.java diff --git a/common/logisticspipes/utils/gui/HandelableSlot.java b/src/main/java/logisticspipes/utils/gui/HandelableSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/HandelableSlot.java rename to src/main/java/logisticspipes/utils/gui/HandelableSlot.java diff --git a/common/logisticspipes/utils/gui/HudGraphics.java b/src/main/java/logisticspipes/utils/gui/HudGraphics.java similarity index 100% rename from common/logisticspipes/utils/gui/HudGraphics.java rename to src/main/java/logisticspipes/utils/gui/HudGraphics.java diff --git a/common/logisticspipes/utils/gui/IGuiAccess.java b/src/main/java/logisticspipes/utils/gui/IGuiAccess.java similarity index 100% rename from common/logisticspipes/utils/gui/IGuiAccess.java rename to src/main/java/logisticspipes/utils/gui/IGuiAccess.java diff --git a/common/logisticspipes/utils/gui/IItemSearch.java b/src/main/java/logisticspipes/utils/gui/IItemSearch.java similarity index 100% rename from common/logisticspipes/utils/gui/IItemSearch.java rename to src/main/java/logisticspipes/utils/gui/IItemSearch.java diff --git a/common/logisticspipes/utils/gui/IItemTextureRenderSlot.java b/src/main/java/logisticspipes/utils/gui/IItemTextureRenderSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/IItemTextureRenderSlot.java rename to src/main/java/logisticspipes/utils/gui/IItemTextureRenderSlot.java diff --git a/common/logisticspipes/utils/gui/IRenderSlot.java b/src/main/java/logisticspipes/utils/gui/IRenderSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/IRenderSlot.java rename to src/main/java/logisticspipes/utils/gui/IRenderSlot.java diff --git a/common/logisticspipes/utils/gui/ISmallColorRenderSlot.java b/src/main/java/logisticspipes/utils/gui/ISmallColorRenderSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/ISmallColorRenderSlot.java rename to src/main/java/logisticspipes/utils/gui/ISmallColorRenderSlot.java diff --git a/common/logisticspipes/utils/gui/ISubGuiControler.java b/src/main/java/logisticspipes/utils/gui/ISubGuiControler.java similarity index 100% rename from common/logisticspipes/utils/gui/ISubGuiControler.java rename to src/main/java/logisticspipes/utils/gui/ISubGuiControler.java diff --git a/common/logisticspipes/utils/gui/InputBar.java b/src/main/java/logisticspipes/utils/gui/InputBar.java similarity index 100% rename from common/logisticspipes/utils/gui/InputBar.java rename to src/main/java/logisticspipes/utils/gui/InputBar.java diff --git a/common/logisticspipes/utils/gui/ItemDisplay.java b/src/main/java/logisticspipes/utils/gui/ItemDisplay.java similarity index 100% rename from common/logisticspipes/utils/gui/ItemDisplay.java rename to src/main/java/logisticspipes/utils/gui/ItemDisplay.java diff --git a/common/logisticspipes/utils/gui/LogisticsBaseGuiScreen.java b/src/main/java/logisticspipes/utils/gui/LogisticsBaseGuiScreen.java similarity index 100% rename from common/logisticspipes/utils/gui/LogisticsBaseGuiScreen.java rename to src/main/java/logisticspipes/utils/gui/LogisticsBaseGuiScreen.java diff --git a/common/logisticspipes/utils/gui/LogisticsBaseTabGuiScreen.java b/src/main/java/logisticspipes/utils/gui/LogisticsBaseTabGuiScreen.java similarity index 100% rename from common/logisticspipes/utils/gui/LogisticsBaseTabGuiScreen.java rename to src/main/java/logisticspipes/utils/gui/LogisticsBaseTabGuiScreen.java diff --git a/common/logisticspipes/utils/gui/ModuleSlot.java b/src/main/java/logisticspipes/utils/gui/ModuleSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/ModuleSlot.java rename to src/main/java/logisticspipes/utils/gui/ModuleSlot.java diff --git a/common/logisticspipes/utils/gui/RestrictedSlot.java b/src/main/java/logisticspipes/utils/gui/RestrictedSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/RestrictedSlot.java rename to src/main/java/logisticspipes/utils/gui/RestrictedSlot.java diff --git a/common/logisticspipes/utils/gui/SimpleGraphics.java b/src/main/java/logisticspipes/utils/gui/SimpleGraphics.java similarity index 100% rename from common/logisticspipes/utils/gui/SimpleGraphics.java rename to src/main/java/logisticspipes/utils/gui/SimpleGraphics.java diff --git a/common/logisticspipes/utils/gui/SmallGuiButton.java b/src/main/java/logisticspipes/utils/gui/SmallGuiButton.java similarity index 100% rename from common/logisticspipes/utils/gui/SmallGuiButton.java rename to src/main/java/logisticspipes/utils/gui/SmallGuiButton.java diff --git a/common/logisticspipes/utils/gui/SneakyUpgradeSlot.java b/src/main/java/logisticspipes/utils/gui/SneakyUpgradeSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/SneakyUpgradeSlot.java rename to src/main/java/logisticspipes/utils/gui/SneakyUpgradeSlot.java diff --git a/common/logisticspipes/utils/gui/StaticRestrictedSlot.java b/src/main/java/logisticspipes/utils/gui/StaticRestrictedSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/StaticRestrictedSlot.java rename to src/main/java/logisticspipes/utils/gui/StaticRestrictedSlot.java diff --git a/common/logisticspipes/utils/gui/SubGuiScreen.java b/src/main/java/logisticspipes/utils/gui/SubGuiScreen.java similarity index 100% rename from common/logisticspipes/utils/gui/SubGuiScreen.java rename to src/main/java/logisticspipes/utils/gui/SubGuiScreen.java diff --git a/common/logisticspipes/utils/gui/TextListDisplay.java b/src/main/java/logisticspipes/utils/gui/TextListDisplay.java similarity index 100% rename from common/logisticspipes/utils/gui/TextListDisplay.java rename to src/main/java/logisticspipes/utils/gui/TextListDisplay.java diff --git a/common/logisticspipes/utils/gui/UnmodifiableSlot.java b/src/main/java/logisticspipes/utils/gui/UnmodifiableSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/UnmodifiableSlot.java rename to src/main/java/logisticspipes/utils/gui/UnmodifiableSlot.java diff --git a/common/logisticspipes/utils/gui/UpgradeSlot.java b/src/main/java/logisticspipes/utils/gui/UpgradeSlot.java similarity index 100% rename from common/logisticspipes/utils/gui/UpgradeSlot.java rename to src/main/java/logisticspipes/utils/gui/UpgradeSlot.java diff --git a/common/logisticspipes/utils/gui/extension/GuiExtension.java b/src/main/java/logisticspipes/utils/gui/extension/GuiExtension.java similarity index 100% rename from common/logisticspipes/utils/gui/extension/GuiExtension.java rename to src/main/java/logisticspipes/utils/gui/extension/GuiExtension.java diff --git a/common/logisticspipes/utils/gui/extension/GuiExtensionController.java b/src/main/java/logisticspipes/utils/gui/extension/GuiExtensionController.java similarity index 100% rename from common/logisticspipes/utils/gui/extension/GuiExtensionController.java rename to src/main/java/logisticspipes/utils/gui/extension/GuiExtensionController.java diff --git a/common/logisticspipes/utils/gui/hud/BasicHUDButton.java b/src/main/java/logisticspipes/utils/gui/hud/BasicHUDButton.java similarity index 100% rename from common/logisticspipes/utils/gui/hud/BasicHUDButton.java rename to src/main/java/logisticspipes/utils/gui/hud/BasicHUDButton.java diff --git a/common/logisticspipes/utils/gui/sideconfig/SideConfigDisplay.java b/src/main/java/logisticspipes/utils/gui/sideconfig/SideConfigDisplay.java similarity index 100% rename from common/logisticspipes/utils/gui/sideconfig/SideConfigDisplay.java rename to src/main/java/logisticspipes/utils/gui/sideconfig/SideConfigDisplay.java diff --git a/common/logisticspipes/utils/item/DictIdentifier.java b/src/main/java/logisticspipes/utils/item/DictIdentifier.java similarity index 100% rename from common/logisticspipes/utils/item/DictIdentifier.java rename to src/main/java/logisticspipes/utils/item/DictIdentifier.java diff --git a/common/logisticspipes/utils/item/DictItemIdentifier.java b/src/main/java/logisticspipes/utils/item/DictItemIdentifier.java similarity index 100% rename from common/logisticspipes/utils/item/DictItemIdentifier.java rename to src/main/java/logisticspipes/utils/item/DictItemIdentifier.java diff --git a/common/logisticspipes/utils/item/ItemIdentifier.java b/src/main/java/logisticspipes/utils/item/ItemIdentifier.java similarity index 99% rename from common/logisticspipes/utils/item/ItemIdentifier.java rename to src/main/java/logisticspipes/utils/item/ItemIdentifier.java index 50b7b042d0..5951e8f0bd 100644 --- a/common/logisticspipes/utils/item/ItemIdentifier.java +++ b/src/main/java/logisticspipes/utils/item/ItemIdentifier.java @@ -432,7 +432,7 @@ public ItemIdentifier getIgnoringData() { } public String getDebugName() { - return item.getUnlocalizedName() + "(ID: " + Item.getIdFromItem(item) + ", Damage: " + itemDamage + ")"; + return item.getTranslationKey() + "(ID: " + Item.getIdFromItem(item) + ", Damage: " + itemDamage + ")"; } @Nonnull @@ -454,7 +454,7 @@ public String getModName() { ResourceLocation rl = item.getRegistryName(); assert rl != null; Map modList = Loader.instance().getIndexedModList(); - ModContainer mc = modList.get(rl.getResourceDomain()); + ModContainer mc = modList.get(rl.getNamespace()); if (mc == null) { // get mod that really registered this item Map map = ReflectionHelper.invokePrivateMethod(ForgeRegistry.class, ForgeRegistries.ITEMS, "getOverrideOwners", "getOverrideOwners", new Class[0], new Object[0]); @@ -476,7 +476,7 @@ public String getCreativeTabName() { if (tab == null && item instanceof ItemBlock) { Block block = Block.getBlockFromItem(item); if (block != Blocks.AIR) { - tab = block.getCreativeTabToDisplayOn(); + tab = block.getCreativeTab(); } } diff --git a/common/logisticspipes/utils/item/ItemIdentifierInventory.java b/src/main/java/logisticspipes/utils/item/ItemIdentifierInventory.java similarity index 100% rename from common/logisticspipes/utils/item/ItemIdentifierInventory.java rename to src/main/java/logisticspipes/utils/item/ItemIdentifierInventory.java diff --git a/common/logisticspipes/utils/item/ItemIdentifierStack.java b/src/main/java/logisticspipes/utils/item/ItemIdentifierStack.java similarity index 100% rename from common/logisticspipes/utils/item/ItemIdentifierStack.java rename to src/main/java/logisticspipes/utils/item/ItemIdentifierStack.java diff --git a/common/logisticspipes/utils/item/ItemStackRenderer.java b/src/main/java/logisticspipes/utils/item/ItemStackRenderer.java similarity index 100% rename from common/logisticspipes/utils/item/ItemStackRenderer.java rename to src/main/java/logisticspipes/utils/item/ItemStackRenderer.java diff --git a/common/logisticspipes/utils/item/SimpleStackInventory.java b/src/main/java/logisticspipes/utils/item/SimpleStackInventory.java similarity index 97% rename from common/logisticspipes/utils/item/SimpleStackInventory.java rename to src/main/java/logisticspipes/utils/item/SimpleStackInventory.java index b2cadc3b35..d59bd1f20a 100644 --- a/common/logisticspipes/utils/item/SimpleStackInventory.java +++ b/src/main/java/logisticspipes/utils/item/SimpleStackInventory.java @@ -14,6 +14,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,6 +42,12 @@ public class SimpleStackInventory implements IInventory, IStore, Iterable _listener = new LinkedList<>(); + public SimpleStackInventory(SimpleStackInventory copy) { + this.stackList = NonNullList.from(new ItemStack(Items.AIR), copy.stackList.toArray(new ItemStack[0])); + _name = copy._name; + _stackLimit = copy._stackLimit; + } + public SimpleStackInventory(int size, String name, int stackLimit) { stackList = NonNullList.withSize(size, ItemStack.EMPTY); _name = name; diff --git a/common/logisticspipes/utils/math/BoundingBox.java b/src/main/java/logisticspipes/utils/math/BoundingBox.java similarity index 100% rename from common/logisticspipes/utils/math/BoundingBox.java rename to src/main/java/logisticspipes/utils/math/BoundingBox.java diff --git a/common/logisticspipes/utils/math/Camera.java b/src/main/java/logisticspipes/utils/math/Camera.java similarity index 100% rename from common/logisticspipes/utils/math/Camera.java rename to src/main/java/logisticspipes/utils/math/Camera.java diff --git a/common/logisticspipes/utils/math/Matrix4d.java b/src/main/java/logisticspipes/utils/math/Matrix4d.java similarity index 100% rename from common/logisticspipes/utils/math/Matrix4d.java rename to src/main/java/logisticspipes/utils/math/Matrix4d.java diff --git a/common/logisticspipes/utils/math/MatrixTranformations.java b/src/main/java/logisticspipes/utils/math/MatrixTranformations.java similarity index 100% rename from common/logisticspipes/utils/math/MatrixTranformations.java rename to src/main/java/logisticspipes/utils/math/MatrixTranformations.java diff --git a/common/logisticspipes/utils/math/Vec2.java b/src/main/java/logisticspipes/utils/math/Vec2.java similarity index 100% rename from common/logisticspipes/utils/math/Vec2.java rename to src/main/java/logisticspipes/utils/math/Vec2.java diff --git a/common/logisticspipes/utils/math/VecmathUtil.java b/src/main/java/logisticspipes/utils/math/VecmathUtil.java similarity index 100% rename from common/logisticspipes/utils/math/VecmathUtil.java rename to src/main/java/logisticspipes/utils/math/VecmathUtil.java diff --git a/common/logisticspipes/utils/math/Vector2d.java b/src/main/java/logisticspipes/utils/math/Vector2d.java similarity index 100% rename from common/logisticspipes/utils/math/Vector2d.java rename to src/main/java/logisticspipes/utils/math/Vector2d.java diff --git a/common/logisticspipes/utils/math/Vector2f.java b/src/main/java/logisticspipes/utils/math/Vector2f.java similarity index 100% rename from common/logisticspipes/utils/math/Vector2f.java rename to src/main/java/logisticspipes/utils/math/Vector2f.java diff --git a/common/logisticspipes/utils/math/Vector3d.java b/src/main/java/logisticspipes/utils/math/Vector3d.java similarity index 100% rename from common/logisticspipes/utils/math/Vector3d.java rename to src/main/java/logisticspipes/utils/math/Vector3d.java diff --git a/common/logisticspipes/utils/math/Vector3f.java b/src/main/java/logisticspipes/utils/math/Vector3f.java similarity index 100% rename from common/logisticspipes/utils/math/Vector3f.java rename to src/main/java/logisticspipes/utils/math/Vector3f.java diff --git a/common/logisticspipes/utils/math/Vector4d.java b/src/main/java/logisticspipes/utils/math/Vector4d.java similarity index 100% rename from common/logisticspipes/utils/math/Vector4d.java rename to src/main/java/logisticspipes/utils/math/Vector4d.java diff --git a/common/logisticspipes/utils/math/Vertex.java b/src/main/java/logisticspipes/utils/math/Vertex.java similarity index 100% rename from common/logisticspipes/utils/math/Vertex.java rename to src/main/java/logisticspipes/utils/math/Vertex.java diff --git a/common/logisticspipes/utils/string/ChatColor.java b/src/main/java/logisticspipes/utils/string/ChatColor.java similarity index 100% rename from common/logisticspipes/utils/string/ChatColor.java rename to src/main/java/logisticspipes/utils/string/ChatColor.java diff --git a/common/logisticspipes/utils/string/StringUtils.java b/src/main/java/logisticspipes/utils/string/StringUtils.java similarity index 100% rename from common/logisticspipes/utils/string/StringUtils.java rename to src/main/java/logisticspipes/utils/string/StringUtils.java diff --git a/common/logisticspipes/utils/transactor/IInvSlot.java b/src/main/java/logisticspipes/utils/transactor/IInvSlot.java similarity index 100% rename from common/logisticspipes/utils/transactor/IInvSlot.java rename to src/main/java/logisticspipes/utils/transactor/IInvSlot.java diff --git a/common/logisticspipes/utils/transactor/ITransactor.java b/src/main/java/logisticspipes/utils/transactor/ITransactor.java similarity index 100% rename from common/logisticspipes/utils/transactor/ITransactor.java rename to src/main/java/logisticspipes/utils/transactor/ITransactor.java diff --git a/common/logisticspipes/utils/transactor/InventoryIterator.java b/src/main/java/logisticspipes/utils/transactor/InventoryIterator.java similarity index 100% rename from common/logisticspipes/utils/transactor/InventoryIterator.java rename to src/main/java/logisticspipes/utils/transactor/InventoryIterator.java diff --git a/common/logisticspipes/utils/transactor/InventoryIteratorSimple.java b/src/main/java/logisticspipes/utils/transactor/InventoryIteratorSimple.java similarity index 100% rename from common/logisticspipes/utils/transactor/InventoryIteratorSimple.java rename to src/main/java/logisticspipes/utils/transactor/InventoryIteratorSimple.java diff --git a/common/logisticspipes/utils/transactor/Transactor.java b/src/main/java/logisticspipes/utils/transactor/Transactor.java similarity index 100% rename from common/logisticspipes/utils/transactor/Transactor.java rename to src/main/java/logisticspipes/utils/transactor/Transactor.java diff --git a/common/logisticspipes/utils/transactor/TransactorSimple.java b/src/main/java/logisticspipes/utils/transactor/TransactorSimple.java similarity index 100% rename from common/logisticspipes/utils/transactor/TransactorSimple.java rename to src/main/java/logisticspipes/utils/transactor/TransactorSimple.java diff --git a/common/logisticspipes/utils/tuples/Pair.java b/src/main/java/logisticspipes/utils/tuples/Pair.java similarity index 100% rename from common/logisticspipes/utils/tuples/Pair.java rename to src/main/java/logisticspipes/utils/tuples/Pair.java diff --git a/common/logisticspipes/utils/tuples/Quartet.java b/src/main/java/logisticspipes/utils/tuples/Quartet.java similarity index 100% rename from common/logisticspipes/utils/tuples/Quartet.java rename to src/main/java/logisticspipes/utils/tuples/Quartet.java diff --git a/common/logisticspipes/utils/tuples/Triplet.java b/src/main/java/logisticspipes/utils/tuples/Triplet.java similarity index 100% rename from common/logisticspipes/utils/tuples/Triplet.java rename to src/main/java/logisticspipes/utils/tuples/Triplet.java diff --git a/src/main/kotlin/network/rs485/logisticspipes/compat/TheOneProbeIntegration.kt b/src/main/kotlin/network/rs485/logisticspipes/compat/TheOneProbeIntegration.kt index 82ac05e046..0da91e6b49 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/compat/TheOneProbeIntegration.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/compat/TheOneProbeIntegration.kt @@ -167,9 +167,9 @@ class TheOneProbeIntegration : Function { private fun addFirewallPipeInfo(pipe: PipeItemsFirewall, probeInfo: IProbeInfo) { val allowed = "${prefix}pipe.firewall.allowed" val blocked = "${prefix}pipe.firewall.blocked" - if (!pipe.inv.isEmpty) { + if (!pipe.moduleFirewall.inv.isEmpty) { probeInfo.element(LPText("${prefix}pipe.firewall.filtering").apply { - arguments.add(pipe.inv.itemsAndCount.count { it.value > 0 }.toString()) + arguments.add(pipe.moduleFirewall.inv.itemsAndCount.count { it.value > 0 }.toString()) arguments.add(if (pipe.isBlocking) blocked else allowed) }) } diff --git a/src/main/kotlin/network/rs485/logisticspipes/config/ServerConfiguration.kt b/src/main/kotlin/network/rs485/logisticspipes/config/ServerConfiguration.kt index 346cfdf720..3619e8d33e 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/config/ServerConfiguration.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/config/ServerConfiguration.kt @@ -37,11 +37,11 @@ package network.rs485.logisticspipes.config +import logisticspipes.utils.FastUUID import com.google.gson.* import com.google.gson.annotations.JsonAdapter import logisticspipes.utils.PlayerIdentifier import java.lang.reflect.Type -import java.util.* private class ServerConfigurationAdapter : JsonSerializer>, JsonDeserializer> { override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Map? { @@ -54,7 +54,7 @@ private class ServerConfigurationAdapter : JsonSerializer if (value !is JsonObject) throw JsonParseException("Expected values in map object to be objects") Pair( - PlayerIdentifier.get(value["name"].asString, UUID.fromString(key)), + PlayerIdentifier.get(value["name"].asString, FastUUID.parseUUID(key)), context.deserialize(value["config"], PlayerConfiguration::class.java) ) } @@ -79,4 +79,4 @@ private class ServerConfigurationAdapter : JsonSerializer = emptyMap() -} \ No newline at end of file +} diff --git a/src/main/kotlin/network/rs485/logisticspipes/connection/DynamicAdjacent.kt b/src/main/kotlin/network/rs485/logisticspipes/connection/DynamicAdjacent.kt index 71ee010eca..04fa20906c 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/connection/DynamicAdjacent.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/connection/DynamicAdjacent.kt @@ -79,5 +79,7 @@ class DynamicAdjacent(private val parent: CoreRoutedPipe, private val cache: Arr } .mapNotNull { (tile, dir) -> LPNeighborTileEntity(tile, dir).takeIf { it.canHandleFluids() } } + override fun copy(): Adjacent = DynamicAdjacent(parent, cache.clone()) + override fun toString(): String = "DynamicAdjacent(${EnumFacing.VALUES.withIndex().joinToString { "{${it.value.name2}: ${cache[it.index]}}" }})" } diff --git a/src/main/kotlin/network/rs485/logisticspipes/connection/NoAdjacent.kt b/src/main/kotlin/network/rs485/logisticspipes/connection/NoAdjacent.kt index 72ac499fc1..4c6f61dd30 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/connection/NoAdjacent.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/connection/NoAdjacent.kt @@ -48,5 +48,6 @@ object NoAdjacent : Adjacent { override fun neighbors(): Map, ConnectionType> = emptyMap() override fun inventories(): List> = emptyList() override fun fluidTanks(): List> = emptyList() + override fun copy(): Adjacent = this override fun toString(): String = "NoAdjacent" } diff --git a/src/main/kotlin/network/rs485/logisticspipes/connection/SingleAdjacent.kt b/src/main/kotlin/network/rs485/logisticspipes/connection/SingleAdjacent.kt index b9190f111b..7e3bbaea15 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/connection/SingleAdjacent.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/connection/SingleAdjacent.kt @@ -67,5 +67,7 @@ class SingleAdjacent(private val parent: CoreRoutedPipe, val dir: EnumFacing, pr }) } else emptyList() + override fun copy(): Adjacent = SingleAdjacent(parent, dir, adjacentType) + override fun toString(): String = "SingleAdjacent(${dir.name2}: $adjacentType)" } diff --git a/src/main/kotlin/network/rs485/logisticspipes/gui/font/FontParser.kt b/src/main/kotlin/network/rs485/logisticspipes/gui/font/FontParser.kt index 925b54d7c8..92dd0f3007 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/gui/font/FontParser.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/gui/font/FontParser.kt @@ -49,7 +49,7 @@ object FontParser { return try { read(Minecraft.getMinecraft().resourceManager.getResource(resourceLocation).inputStream.bufferedReader().use { it.readLines() }) } catch (e: IOException) { - LogisticsPipes.log.error("Font ${resourceLocation.resourcePath} not found, and will not be rendered.", e) + LogisticsPipes.log.error("Font ${resourceLocation.path} not found, and will not be rendered.", e) null } } diff --git a/src/main/kotlin/network/rs485/logisticspipes/gui/font/LPFontRenderer.kt b/src/main/kotlin/network/rs485/logisticspipes/gui/font/LPFontRenderer.kt index eb601adf85..9538b23753 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/gui/font/LPFontRenderer.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/gui/font/LPFontRenderer.kt @@ -95,7 +95,7 @@ class LPFontRenderer(private val fontName: String) { private val fontPlain: IFont by lazy { val initialTime = System.currentTimeMillis() val fontResourcePlain = ResourceLocation(LPConstants.LP_MOD_ID, "fonts/$fontName.bdf") - FontParser.read(fontResourcePlain).also { LogisticsPipes.log.info("Elapsed time parsing font: ${System.currentTimeMillis() - initialTime}ms") } ?: throw IOException("Failed to load ${fontResourcePlain.resourcePath}, this is not tolerated.") + FontParser.read(fontResourcePlain).also { LogisticsPipes.log.info("Elapsed time parsing font: ${System.currentTimeMillis() - initialTime}ms") } ?: throw IOException("Failed to load ${fontResourcePlain.path}, this is not tolerated.") } private val wrapperPlain: FontWrapper by lazy { diff --git a/src/main/kotlin/network/rs485/logisticspipes/gui/guidebook/DrawableImageParagraph.kt b/src/main/kotlin/network/rs485/logisticspipes/gui/guidebook/DrawableImageParagraph.kt index 93491109be..b708fe4479 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/gui/guidebook/DrawableImageParagraph.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/gui/guidebook/DrawableImageParagraph.kt @@ -102,7 +102,7 @@ class DrawableImage(private var imageResource: ResourceLocation) : Drawable { val resource = Minecraft.getMinecraft().resourceManager.getResource(imageResource) PngSizeInfo.makeFromResource(resource) } catch (e: IOException) { - LogisticsPipes.log.error("File not found: ${imageResource.resourcePath}") + LogisticsPipes.log.error("File not found: ${imageResource.path}") null } val broken: Boolean get() = imageSize == null diff --git a/src/main/kotlin/network/rs485/logisticspipes/property/AdjacentProperty.kt b/src/main/kotlin/network/rs485/logisticspipes/property/AdjacentProperty.kt new file mode 100644 index 0000000000..871e871521 --- /dev/null +++ b/src/main/kotlin/network/rs485/logisticspipes/property/AdjacentProperty.kt @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2023 RS485 + * + * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public + * License 1.0.1, or MMPL. Please check the contents of the license located in + * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md + * + * This file can instead be distributed under the license terms of the + * MIT license: + * + * Copyright (c) 2023 RS485 + * + * This MIT license was reworded to only match this file. If you use the regular + * MIT license in your project, replace this copyright notice (this line and any + * lines below and NOT the copyright line above) with the lines from the original + * MIT license located here: http://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this file and associated documentation files (the "Source Code"), to deal in + * the Source Code without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Source Code, and to permit persons to whom the Source Code is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Source Code, which also can be + * distributed under the MIT. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package network.rs485.logisticspipes.property + +import network.rs485.logisticspipes.connection.Adjacent +import network.rs485.logisticspipes.connection.ConnectionType +import network.rs485.logisticspipes.connection.SingleAdjacent +import logisticspipes.pipes.basic.CoreRoutedPipe +import logisticspipes.utils.EnumFacingUtil +import net.minecraft.nbt.NBTTagCompound + +class AdjacentProperty( + defaultValue: Adjacent?, + private val parent: CoreRoutedPipe, + override val tagKey: String +) : ValueProperty(defaultValue) { + + override fun copyValue(): Adjacent? = value?.copy() + + override fun copyProperty(): AdjacentProperty = + AdjacentProperty(copyValue(), parent, tagKey) + + override fun readFromNBT(tag: NBTTagCompound) { + if (tag.hasKey(tagKey)) { + val ordinalValue = tag.getInteger(tagKey) + value = if (ordinalValue == -1) { + null + } else { + SingleAdjacent(parent, EnumFacingUtil.getOrientation(ordinalValue % 6), ConnectionType.UNDEFINED) + } + } + } + + override fun writeToNBT(tag: NBTTagCompound) { + value?.takeIf { it is SingleAdjacent } + ?.let { tag.setInteger(tagKey, (it as SingleAdjacent).dir.ordinal) } ?: tag.setInteger(tagKey, -1) + } +} diff --git a/src/main/kotlin/network/rs485/logisticspipes/property/InventoryProperty.kt b/src/main/kotlin/network/rs485/logisticspipes/property/InventoryProperty.kt index 275e8a7eb1..ec2786239b 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/property/InventoryProperty.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/property/InventoryProperty.kt @@ -41,6 +41,7 @@ import logisticspipes.utils.item.ItemIdentifierInventory import logisticspipes.utils.item.ItemIdentifierStack import net.minecraft.item.ItemStack import net.minecraft.nbt.NBTTagCompound +import net.minecraft.world.World import network.rs485.logisticspipes.inventory.IItemIdentifierInventory import network.rs485.logisticspipes.inventory.SlotAccess import java.util.concurrent.CopyOnWriteArraySet @@ -59,6 +60,8 @@ class InventoryProperty(private val inv: ItemIdentifierInventory, override val t override val size: Int = sizeInventory + fun clearGrid(): Unit = inv.clearGrid() + override fun decrStackSize(index: Int, count: Int): ItemStack = inv.decrStackSize(index, count).alsoIChanged() override fun removeStackFromSlot(index: Int): ItemStack = inv.removeStackFromSlot(index).alsoIChanged() @@ -100,4 +103,8 @@ class InventoryProperty(private val inv: ItemIdentifierInventory, override val t override fun iterator(): Iterator = inv.itemsAndCount.map { it.key.makeStack(it.value) }.iterator() + fun dropContents(world: World, x: Int, y: Int, z: Int) = inv.dropContents(world, x, y, z) + + fun getInvProperty(): ItemIdentifierInventory = inv + } diff --git a/src/main/kotlin/network/rs485/logisticspipes/property/ItemStackProperty.kt b/src/main/kotlin/network/rs485/logisticspipes/property/ItemStackProperty.kt new file mode 100644 index 0000000000..df682d07d4 --- /dev/null +++ b/src/main/kotlin/network/rs485/logisticspipes/property/ItemStackProperty.kt @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2023 RS485 + * + * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public + * License 1.0.1, or MMPL. Please check the contents of the license located in + * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md + * + * This file can instead be distributed under the license terms of the + * MIT license: + * + * Copyright (c) 2023 RS485 + * + * This MIT license was reworded to only match this file. If you use the regular + * MIT license in your project, replace this copyright notice (this line and any + * lines below and NOT the copyright line above) with the lines from the original + * MIT license located here: http://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this file and associated documentation files (the "Source Code"), to deal in + * the Source Code without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Source Code, and to permit persons to whom the Source Code is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Source Code, which also can be + * distributed under the MIT. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package network.rs485.logisticspipes.property + +import net.minecraft.item.ItemStack +import net.minecraft.nbt.NBTTagCompound +import network.rs485.logisticspipes.util.items.ItemStackLoader + +class ItemStackProperty(initialValue: ItemStack, override val tagKey: String) : ValueProperty(initialValue) { + override fun copyValue(): ItemStack = value.copy() + + override fun copyProperty(): Property = ItemStackProperty(copyValue(), tagKey) + + override fun readFromNBT(tag: NBTTagCompound) { + if (tag.hasKey(tagKey)) { + val item: NBTTagCompound = tag.getCompoundTag(tagKey) + value = ItemStackLoader.loadAndFixItemStackFromNBT(item) + } + } + + override fun writeToNBT(tag: NBTTagCompound) { + if (!value.isEmpty) { + val itemNBT = NBTTagCompound() + value.writeToNBT(itemNBT) + tag.setTag(tagKey, itemNBT) + } + } + + fun isEmpty(): Boolean = value.isEmpty +} diff --git a/src/main/kotlin/network/rs485/logisticspipes/property/ModuleUMListProperty.kt b/src/main/kotlin/network/rs485/logisticspipes/property/ModuleUMListProperty.kt new file mode 100644 index 0000000000..12d53319d3 --- /dev/null +++ b/src/main/kotlin/network/rs485/logisticspipes/property/ModuleUMListProperty.kt @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2023 RS485 + * + * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public + * License 1.0.1, or MMPL. Please check the contents of the license located in + * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md + * + * This file can instead be distributed under the license terms of the + * MIT license: + * + * Copyright (c) 2023 RS485 + * + * This MIT license was reworded to only match this file. If you use the regular + * MIT license in your project, replace this copyright notice (this line and any + * lines below and NOT the copyright line above) with the lines from the original + * MIT license located here: http://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this file and associated documentation files (the "Source Code"), to deal in + * the Source Code without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Source Code, and to permit persons to whom the Source Code is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Source Code, which also can be + * distributed under the MIT. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package network.rs485.logisticspipes.property + +import logisticspipes.pipes.upgrades.ModuleUpgradeManager +import net.minecraft.nbt.NBTTagCompound + + +class ModuleUMListProperty : NonNullListProperty { + override val tagKey: String + + constructor(tagKey: String) : super(mutableListOf()) { + this.tagKey = tagKey + } + + constructor(tagKey: String, list: MutableList) : super(list) { + this.tagKey = tagKey + } + + override fun copyValue(obj: ModuleUpgradeManager): ModuleUpgradeManager { + TODO("Not yet implemented") + } + + override fun defaultValue(idx: Int): ModuleUpgradeManager { + TODO("Not yet implemented") + } + + override fun writeToNBT(tag: NBTTagCompound) { + for (i in 0 until this.size) { + list.get(i).writeToNBT(tag, Integer.toString(i)) + } + } + + override fun readSingleFromNBT(tag: NBTTagCompound, key: String): ModuleUpgradeManager { + TODO("Not yet implemented") + } + + override fun copyProperty(): Property> { + TODO("Not yet implemented") + } + + override fun writeSingleToNBT(tag: NBTTagCompound, key: String, value: ModuleUpgradeManager) { + value.writeToNBT(tag, key) + } +} diff --git a/src/main/kotlin/network/rs485/logisticspipes/property/SimpleInventoryProperty.kt b/src/main/kotlin/network/rs485/logisticspipes/property/SimpleInventoryProperty.kt new file mode 100644 index 0000000000..2b681da78b --- /dev/null +++ b/src/main/kotlin/network/rs485/logisticspipes/property/SimpleInventoryProperty.kt @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2023 RS485 + * + * "LogisticsPipes" is distributed under the terms of the Minecraft Mod Public + * License 1.0.1, or MMPL. Please check the contents of the license located in + * https://github.com/RS485/LogisticsPipes/blob/dev/LICENSE.md + * + * This file can instead be distributed under the license terms of the + * MIT license: + * + * Copyright (c) 2023 RS485 + * + * This MIT license was reworded to only match this file. If you use the regular + * MIT license in your project, replace this copyright notice (this line and any + * lines below and NOT the copyright line above) with the lines from the original + * MIT license located here: http://opensource.org/licenses/MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this file and associated documentation files (the "Source Code"), to deal in + * the Source Code without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Source Code, and to permit persons to whom the Source Code is furnished + * to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Source Code, which also can be + * distributed under the MIT. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package network.rs485.logisticspipes.property + +import logisticspipes.utils.item.SimpleStackInventory +import net.minecraft.inventory.IInventory +import net.minecraft.item.ItemStack +import net.minecraft.nbt.NBTTagCompound +import net.minecraft.util.math.BlockPos +import net.minecraft.world.World +import java.util.concurrent.CopyOnWriteArraySet + +class SimpleInventoryProperty(private val inv: SimpleStackInventory, override val tagKey: String) : + Property, IInventory by inv, Collection { + + override val propertyObservers: CopyOnWriteArraySet> = + CopyOnWriteArraySet() + + override fun copyValue(): SimpleStackInventory = SimpleStackInventory(inv) + + override fun copyProperty(): Property = SimpleInventoryProperty(copyValue(), tagKey) + + override fun readFromNBT(tag: NBTTagCompound) = inv.readFromNBT(tag, tagKey) + + override fun writeToNBT(tag: NBTTagCompound) = inv.writeToNBT(tag, tagKey) + + override val size: Int = sizeInventory + + override fun iterator(): Iterator = inv.map { it -> it.component1() }.iterator() + + override fun containsAll(elements: Collection): Boolean = + inv.map { it -> it.component1() }.containsAll(elements) + + override fun contains(element: ItemStack): Boolean = + inv.map { it -> it.component1() }.contains(element) + + fun clearInventorySlotContents(i: Int) = inv.clearInventorySlotContents(i) + + fun dropContents(world: World, pos: BlockPos) = inv.dropContents(world, pos) + + fun addCompressed(left: ItemStack, b: Boolean): Int = inv.addCompressed(left, b) + +} diff --git a/src/main/kotlin/network/rs485/logisticspipes/util/TextUtil.kt b/src/main/kotlin/network/rs485/logisticspipes/util/TextUtil.kt index a1b2c2af2c..2d9110cfc8 100644 --- a/src/main/kotlin/network/rs485/logisticspipes/util/TextUtil.kt +++ b/src/main/kotlin/network/rs485/logisticspipes/util/TextUtil.kt @@ -120,12 +120,12 @@ object TextUtil { fun addTooltipInformation(stack: ItemStack, tooltip: MutableList, extended: Boolean){ if(extended) { var tooltipLine = 1 - while(I18n.hasKey("${stack.unlocalizedName}.tip$tooltipLine")){ - tooltip += translate("${stack.unlocalizedName}.tip$tooltipLine") + while(I18n.hasKey("${stack.translationKey}.tip$tooltipLine")){ + tooltip += translate("${stack.translationKey}.tip$tooltipLine") tooltipLine++ } } else { - if(I18n.hasKey("${stack.unlocalizedName}.tip1")){ + if(I18n.hasKey("${stack.translationKey}.tip1")){ tooltip += translate(holdShiftTooltip) } } diff --git a/resources/assets/logisticspipes/blockstates/pipe.json b/src/main/resources/assets/logisticspipes/blockstates/pipe.json similarity index 100% rename from resources/assets/logisticspipes/blockstates/pipe.json rename to src/main/resources/assets/logisticspipes/blockstates/pipe.json diff --git a/resources/assets/logisticspipes/blockstates/solid_block.json b/src/main/resources/assets/logisticspipes/blockstates/solid_block.json similarity index 100% rename from resources/assets/logisticspipes/blockstates/solid_block.json rename to src/main/resources/assets/logisticspipes/blockstates/solid_block.json diff --git a/resources/assets/logisticspipes/blockstates/sub_multiblock.json b/src/main/resources/assets/logisticspipes/blockstates/sub_multiblock.json similarity index 100% rename from resources/assets/logisticspipes/blockstates/sub_multiblock.json rename to src/main/resources/assets/logisticspipes/blockstates/sub_multiblock.json diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/active_routing.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/active_routing.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/active_routing.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/active_routing.md diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/consolidating_pipes.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/consolidating_pipes.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/consolidating_pipes.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/consolidating_pipes.md diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/crafting.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/crafting.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/crafting.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/crafting.md diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/index.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/index.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/index.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/index.md diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/managing_items_with_pipes.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/managing_items_with_pipes.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/managing_items_with_pipes.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/managing_items_with_pipes.md diff --git a/resources/assets/logisticspipes/book/en_us/dev_zero_guides/passive_routing.md b/src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/passive_routing.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/dev_zero_guides/passive_routing.md rename to src/main/resources/assets/logisticspipes/book/en_us/dev_zero_guides/passive_routing.md diff --git a/resources/assets/logisticspipes/book/en_us/main_menu.md b/src/main/resources/assets/logisticspipes/book/en_us/main_menu.md similarity index 100% rename from resources/assets/logisticspipes/book/en_us/main_menu.md rename to src/main/resources/assets/logisticspipes/book/en_us/main_menu.md diff --git a/resources/assets/logisticspipes/fonts/OFL.TXT b/src/main/resources/assets/logisticspipes/fonts/OFL.TXT similarity index 97% rename from resources/assets/logisticspipes/fonts/OFL.TXT rename to src/main/resources/assets/logisticspipes/fonts/OFL.TXT index 8468f0ded2..38cbd33e52 100644 --- a/resources/assets/logisticspipes/fonts/OFL.TXT +++ b/src/main/resources/assets/logisticspipes/fonts/OFL.TXT @@ -1,94 +1,94 @@ -Copyright (c) 2019 Dimitar Toshkov Zhekov, -with Reserved Font Name "Terminus Font". - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +Copyright (c) 2019 Dimitar Toshkov Zhekov, +with Reserved Font Name "Terminus Font". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/resources/assets/logisticspipes/fonts/minecraft-bold.bdf b/src/main/resources/assets/logisticspipes/fonts/minecraft-bold.bdf similarity index 100% rename from resources/assets/logisticspipes/fonts/minecraft-bold.bdf rename to src/main/resources/assets/logisticspipes/fonts/minecraft-bold.bdf diff --git a/resources/assets/logisticspipes/fonts/minecraft-plain.bdf b/src/main/resources/assets/logisticspipes/fonts/minecraft-plain.bdf similarity index 100% rename from resources/assets/logisticspipes/fonts/minecraft-plain.bdf rename to src/main/resources/assets/logisticspipes/fonts/minecraft-plain.bdf diff --git a/resources/assets/logisticspipes/fonts/ter-u12n.bdf b/src/main/resources/assets/logisticspipes/fonts/ter-u12n.bdf similarity index 100% rename from resources/assets/logisticspipes/fonts/ter-u12n.bdf rename to src/main/resources/assets/logisticspipes/fonts/ter-u12n.bdf diff --git a/resources/assets/logisticspipes/lang/en_us.lang b/src/main/resources/assets/logisticspipes/lang/en_us.lang similarity index 100% rename from resources/assets/logisticspipes/lang/en_us.lang rename to src/main/resources/assets/logisticspipes/lang/en_us.lang diff --git a/resources/assets/logisticspipes/models/block/pipe.json b/src/main/resources/assets/logisticspipes/models/block/pipe.json similarity index 100% rename from resources/assets/logisticspipes/models/block/pipe.json rename to src/main/resources/assets/logisticspipes/models/block/pipe.json diff --git a/resources/assets/logisticspipes/models/block/solid_block.json b/src/main/resources/assets/logisticspipes/models/block/solid_block.json similarity index 100% rename from resources/assets/logisticspipes/models/block/solid_block.json rename to src/main/resources/assets/logisticspipes/models/block/solid_block.json diff --git a/resources/assets/logisticspipes/models/block/sub_multiblock.json b/src/main/resources/assets/logisticspipes/models/block/sub_multiblock.json similarity index 100% rename from resources/assets/logisticspipes/models/block/sub_multiblock.json rename to src/main/resources/assets/logisticspipes/models/block/sub_multiblock.json diff --git a/resources/assets/logisticspipes/models/item/broken_item.json b/src/main/resources/assets/logisticspipes/models/item/broken_item.json similarity index 100% rename from resources/assets/logisticspipes/models/item/broken_item.json rename to src/main/resources/assets/logisticspipes/models/item/broken_item.json diff --git a/resources/assets/logisticspipes/models/item/chip/advanced.json b/src/main/resources/assets/logisticspipes/models/item/chip/advanced.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/advanced.json rename to src/main/resources/assets/logisticspipes/models/item/chip/advanced.json diff --git a/resources/assets/logisticspipes/models/item/chip/advanced_raw.json b/src/main/resources/assets/logisticspipes/models/item/chip/advanced_raw.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/advanced_raw.json rename to src/main/resources/assets/logisticspipes/models/item/chip/advanced_raw.json diff --git a/resources/assets/logisticspipes/models/item/chip/basic.json b/src/main/resources/assets/logisticspipes/models/item/chip/basic.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/basic.json rename to src/main/resources/assets/logisticspipes/models/item/chip/basic.json diff --git a/resources/assets/logisticspipes/models/item/chip/basic_raw.json b/src/main/resources/assets/logisticspipes/models/item/chip/basic_raw.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/basic_raw.json rename to src/main/resources/assets/logisticspipes/models/item/chip/basic_raw.json diff --git a/resources/assets/logisticspipes/models/item/chip/fpga.json b/src/main/resources/assets/logisticspipes/models/item/chip/fpga.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/fpga.json rename to src/main/resources/assets/logisticspipes/models/item/chip/fpga.json diff --git a/resources/assets/logisticspipes/models/item/chip/fpga_raw.json b/src/main/resources/assets/logisticspipes/models/item/chip/fpga_raw.json similarity index 100% rename from resources/assets/logisticspipes/models/item/chip/fpga_raw.json rename to src/main/resources/assets/logisticspipes/models/item/chip/fpga_raw.json diff --git a/resources/assets/logisticspipes/models/item/disk.json b/src/main/resources/assets/logisticspipes/models/item/disk.json similarity index 100% rename from resources/assets/logisticspipes/models/item/disk.json rename to src/main/resources/assets/logisticspipes/models/item/disk.json diff --git a/resources/assets/logisticspipes/models/item/fluid_container.json b/src/main/resources/assets/logisticspipes/models/item/fluid_container.json similarity index 100% rename from resources/assets/logisticspipes/models/item/fluid_container.json rename to src/main/resources/assets/logisticspipes/models/item/fluid_container.json diff --git a/resources/assets/logisticspipes/models/item/guide_book.json b/src/main/resources/assets/logisticspipes/models/item/guide_book.json similarity index 100% rename from resources/assets/logisticspipes/models/item/guide_book.json rename to src/main/resources/assets/logisticspipes/models/item/guide_book.json diff --git a/resources/assets/logisticspipes/models/item/hud_glasses.json b/src/main/resources/assets/logisticspipes/models/item/hud_glasses.json similarity index 100% rename from resources/assets/logisticspipes/models/item/hud_glasses.json rename to src/main/resources/assets/logisticspipes/models/item/hud_glasses.json diff --git a/resources/assets/logisticspipes/models/item/item_card.json b/src/main/resources/assets/logisticspipes/models/item/item_card.json similarity index 100% rename from resources/assets/logisticspipes/models/item/item_card.json rename to src/main/resources/assets/logisticspipes/models/item/item_card.json diff --git a/resources/assets/logisticspipes/models/item/logistics_programmer.json b/src/main/resources/assets/logisticspipes/models/item/logistics_programmer.json similarity index 100% rename from resources/assets/logisticspipes/models/item/logistics_programmer.json rename to src/main/resources/assets/logisticspipes/models/item/logistics_programmer.json diff --git a/resources/assets/logisticspipes/models/item/module/active_supplier.json b/src/main/resources/assets/logisticspipes/models/item/module/active_supplier.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/active_supplier.json rename to src/main/resources/assets/logisticspipes/models/item/module/active_supplier.json diff --git a/resources/assets/logisticspipes/models/item/module/blank.json b/src/main/resources/assets/logisticspipes/models/item/module/blank.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/blank.json rename to src/main/resources/assets/logisticspipes/models/item/module/blank.json diff --git a/resources/assets/logisticspipes/models/item/module/crafter.json b/src/main/resources/assets/logisticspipes/models/item/module/crafter.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/crafter.json rename to src/main/resources/assets/logisticspipes/models/item/module/crafter.json diff --git a/resources/assets/logisticspipes/models/item/module/crafter_mk2.json b/src/main/resources/assets/logisticspipes/models/item/module/crafter_mk2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/crafter_mk2.json rename to src/main/resources/assets/logisticspipes/models/item/module/crafter_mk2.json diff --git a/resources/assets/logisticspipes/models/item/module/crafter_mk3.json b/src/main/resources/assets/logisticspipes/models/item/module/crafter_mk3.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/crafter_mk3.json rename to src/main/resources/assets/logisticspipes/models/item/module/crafter_mk3.json diff --git a/resources/assets/logisticspipes/models/item/module/enchantment_sink.json b/src/main/resources/assets/logisticspipes/models/item/module/enchantment_sink.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/enchantment_sink.json rename to src/main/resources/assets/logisticspipes/models/item/module/enchantment_sink.json diff --git a/resources/assets/logisticspipes/models/item/module/enchantment_sink_mk2.json b/src/main/resources/assets/logisticspipes/models/item/module/enchantment_sink_mk2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/enchantment_sink_mk2.json rename to src/main/resources/assets/logisticspipes/models/item/module/enchantment_sink_mk2.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor_advanced.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor_advanced.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk2.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor_advanced_mk2.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk2.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk3.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk3.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor_advanced_mk3.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor_advanced_mk3.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor_mk2.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor_mk2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor_mk2.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor_mk2.json diff --git a/resources/assets/logisticspipes/models/item/module/extractor_mk3.json b/src/main/resources/assets/logisticspipes/models/item/module/extractor_mk3.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/extractor_mk3.json rename to src/main/resources/assets/logisticspipes/models/item/module/extractor_mk3.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink_cc.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink_cc.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink_cc.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink_cc.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink_creativetab.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink_creativetab.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink_creativetab.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink_creativetab.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink_mod.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink_mod.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink_mod.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink_mod.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink_oredict.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink_oredict.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink_oredict.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink_oredict.json diff --git a/resources/assets/logisticspipes/models/item/module/item_sink_polymorphic.json b/src/main/resources/assets/logisticspipes/models/item/module/item_sink_polymorphic.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/item_sink_polymorphic.json rename to src/main/resources/assets/logisticspipes/models/item/module/item_sink_polymorphic.json diff --git a/resources/assets/logisticspipes/models/item/module/passive_supplier.json b/src/main/resources/assets/logisticspipes/models/item/module/passive_supplier.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/passive_supplier.json rename to src/main/resources/assets/logisticspipes/models/item/module/passive_supplier.json diff --git a/resources/assets/logisticspipes/models/item/module/provider.json b/src/main/resources/assets/logisticspipes/models/item/module/provider.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/provider.json rename to src/main/resources/assets/logisticspipes/models/item/module/provider.json diff --git a/resources/assets/logisticspipes/models/item/module/provider_mk2.json b/src/main/resources/assets/logisticspipes/models/item/module/provider_mk2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/provider_mk2.json rename to src/main/resources/assets/logisticspipes/models/item/module/provider_mk2.json diff --git a/resources/assets/logisticspipes/models/item/module/quick_sort.json b/src/main/resources/assets/logisticspipes/models/item/module/quick_sort.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/quick_sort.json rename to src/main/resources/assets/logisticspipes/models/item/module/quick_sort.json diff --git a/resources/assets/logisticspipes/models/item/module/quick_sort_cc.json b/src/main/resources/assets/logisticspipes/models/item/module/quick_sort_cc.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/quick_sort_cc.json rename to src/main/resources/assets/logisticspipes/models/item/module/quick_sort_cc.json diff --git a/resources/assets/logisticspipes/models/item/module/terminus.json b/src/main/resources/assets/logisticspipes/models/item/module/terminus.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/terminus.json rename to src/main/resources/assets/logisticspipes/models/item/module/terminus.json diff --git a/resources/assets/logisticspipes/models/item/module/thaumic_aspect_sink.json b/src/main/resources/assets/logisticspipes/models/item/module/thaumic_aspect_sink.json similarity index 100% rename from resources/assets/logisticspipes/models/item/module/thaumic_aspect_sink.json rename to src/main/resources/assets/logisticspipes/models/item/module/thaumic_aspect_sink.json diff --git a/resources/assets/logisticspipes/models/item/parts/0.json b/src/main/resources/assets/logisticspipes/models/item/parts/0.json similarity index 100% rename from resources/assets/logisticspipes/models/item/parts/0.json rename to src/main/resources/assets/logisticspipes/models/item/parts/0.json diff --git a/resources/assets/logisticspipes/models/item/parts/1.json b/src/main/resources/assets/logisticspipes/models/item/parts/1.json similarity index 100% rename from resources/assets/logisticspipes/models/item/parts/1.json rename to src/main/resources/assets/logisticspipes/models/item/parts/1.json diff --git a/resources/assets/logisticspipes/models/item/parts/2.json b/src/main/resources/assets/logisticspipes/models/item/parts/2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/parts/2.json rename to src/main/resources/assets/logisticspipes/models/item/parts/2.json diff --git a/resources/assets/logisticspipes/models/item/parts/3.json b/src/main/resources/assets/logisticspipes/models/item/parts/3.json similarity index 100% rename from resources/assets/logisticspipes/models/item/parts/3.json rename to src/main/resources/assets/logisticspipes/models/item/parts/3.json diff --git a/resources/assets/logisticspipes/models/item/pipe.json b/src/main/resources/assets/logisticspipes/models/item/pipe.json similarity index 100% rename from resources/assets/logisticspipes/models/item/pipe.json rename to src/main/resources/assets/logisticspipes/models/item/pipe.json diff --git a/resources/assets/logisticspipes/models/item/pipe_controller.json b/src/main/resources/assets/logisticspipes/models/item/pipe_controller.json similarity index 100% rename from resources/assets/logisticspipes/models/item/pipe_controller.json rename to src/main/resources/assets/logisticspipes/models/item/pipe_controller.json diff --git a/resources/assets/logisticspipes/models/item/pipe_manager.json b/src/main/resources/assets/logisticspipes/models/item/pipe_manager.json similarity index 100% rename from resources/assets/logisticspipes/models/item/pipe_manager.json rename to src/main/resources/assets/logisticspipes/models/item/pipe_manager.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/0.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/0.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/0.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/0.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/1.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/1.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/1.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/1.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/10.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/10.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/10.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/10.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/11.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/11.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/11.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/11.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/12.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/12.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/12.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/12.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/13.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/13.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/13.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/13.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/14.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/14.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/14.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/14.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/15.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/15.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/15.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/15.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/16.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/16.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/16.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/16.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/2.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/2.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/2.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/2.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/3.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/3.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/3.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/3.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/4.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/4.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/4.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/4.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/5.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/5.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/5.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/5.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/6.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/6.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/6.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/6.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/7.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/7.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/7.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/7.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/8.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/8.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/8.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/8.json diff --git a/resources/assets/logisticspipes/models/item/remote_orderer/9.json b/src/main/resources/assets/logisticspipes/models/item/remote_orderer/9.json similarity index 100% rename from resources/assets/logisticspipes/models/item/remote_orderer/9.json rename to src/main/resources/assets/logisticspipes/models/item/remote_orderer/9.json diff --git a/resources/assets/logisticspipes/models/item/sign_creator.0.json b/src/main/resources/assets/logisticspipes/models/item/sign_creator.0.json similarity index 100% rename from resources/assets/logisticspipes/models/item/sign_creator.0.json rename to src/main/resources/assets/logisticspipes/models/item/sign_creator.0.json diff --git a/resources/assets/logisticspipes/models/item/sign_creator.1.json b/src/main/resources/assets/logisticspipes/models/item/sign_creator.1.json similarity index 100% rename from resources/assets/logisticspipes/models/item/sign_creator.1.json rename to src/main/resources/assets/logisticspipes/models/item/sign_creator.1.json diff --git a/resources/assets/logisticspipes/models/item/solid_block.json b/src/main/resources/assets/logisticspipes/models/item/solid_block.json similarity index 100% rename from resources/assets/logisticspipes/models/item/solid_block.json rename to src/main/resources/assets/logisticspipes/models/item/solid_block.json diff --git a/resources/assets/logisticspipes/models/item/sub_multiblock.json b/src/main/resources/assets/logisticspipes/models/item/sub_multiblock.json similarity index 100% rename from resources/assets/logisticspipes/models/item/sub_multiblock.json rename to src/main/resources/assets/logisticspipes/models/item/sub_multiblock.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/action_speed.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/action_speed.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/action_speed.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/action_speed.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/cc_remote_control.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/cc_remote_control.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/cc_remote_control.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/cc_remote_control.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/crafting_byproduct.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_byproduct.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/crafting_byproduct.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_byproduct.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/crafting_cleanup.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_cleanup.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/crafting_cleanup.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_cleanup.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/crafting_monitoring.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_monitoring.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/crafting_monitoring.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/crafting_monitoring.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/disconnection.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/disconnection.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/disconnection.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/disconnection.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/fluid_crafting.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/fluid_crafting.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/fluid_crafting.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/fluid_crafting.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/fuzzy.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/fuzzy.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/fuzzy.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/fuzzy.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/item_extraction.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/item_extraction.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/item_extraction.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/item_extraction.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/item_stack_extraction.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/item_stack_extraction.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/item_stack_extraction.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/item_stack_extraction.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/logic_controller.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/logic_controller.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/logic_controller.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/logic_controller.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/module_upgrade.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/module_upgrade.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/module_upgrade.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/module_upgrade.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/opaque.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/opaque.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/opaque.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/opaque.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/pattern.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/pattern.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/pattern.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/pattern.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_ev.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_ev.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_ev.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_ev.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_hv.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_hv.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_hv.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_hv.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_lv.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_lv.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_lv.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_lv.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_mv.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_mv.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_mv.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_eu_mv.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_mj.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_mj.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_mj.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_mj.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_supplier_rf.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_rf.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_supplier_rf.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_supplier_rf.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/power_transportation.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/power_transportation.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/power_transportation.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/power_transportation.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/satellite_advanced.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/satellite_advanced.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/satellite_advanced.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/satellite_advanced.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/sneaky.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/sneaky.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/sneaky.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/sneaky.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/sneaky_combination.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/sneaky_combination.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/sneaky_combination.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/sneaky_combination.json diff --git a/resources/assets/logisticspipes/models/item/upgrade/speed.json b/src/main/resources/assets/logisticspipes/models/item/upgrade/speed.json similarity index 100% rename from resources/assets/logisticspipes/models/item/upgrade/speed.json rename to src/main/resources/assets/logisticspipes/models/item/upgrade/speed.json diff --git a/resources/assets/logisticspipes/recipes/_factories.json b/src/main/resources/assets/logisticspipes/recipes/_factories.json similarity index 100% rename from resources/assets/logisticspipes/recipes/_factories.json rename to src/main/resources/assets/logisticspipes/recipes/_factories.json diff --git a/resources/assets/logisticspipes/recipes/block_frame.json b/src/main/resources/assets/logisticspipes/recipes/block_frame.json similarity index 100% rename from resources/assets/logisticspipes/recipes/block_frame.json rename to src/main/resources/assets/logisticspipes/recipes/block_frame.json diff --git a/resources/assets/logisticspipes/recipes/chip/chip_advanced_raw.json b/src/main/resources/assets/logisticspipes/recipes/chip/chip_advanced_raw.json similarity index 100% rename from resources/assets/logisticspipes/recipes/chip/chip_advanced_raw.json rename to src/main/resources/assets/logisticspipes/recipes/chip/chip_advanced_raw.json diff --git a/resources/assets/logisticspipes/recipes/chip/chip_basic_raw.json b/src/main/resources/assets/logisticspipes/recipes/chip/chip_basic_raw.json similarity index 100% rename from resources/assets/logisticspipes/recipes/chip/chip_basic_raw.json rename to src/main/resources/assets/logisticspipes/recipes/chip/chip_basic_raw.json diff --git a/resources/assets/logisticspipes/recipes/chip/chip_basic_raw_nocopper.json b/src/main/resources/assets/logisticspipes/recipes/chip/chip_basic_raw_nocopper.json similarity index 100% rename from resources/assets/logisticspipes/recipes/chip/chip_basic_raw_nocopper.json rename to src/main/resources/assets/logisticspipes/recipes/chip/chip_basic_raw_nocopper.json diff --git a/resources/assets/logisticspipes/recipes/chip/chip_fpga_raw.json b/src/main/resources/assets/logisticspipes/recipes/chip/chip_fpga_raw.json similarity index 100% rename from resources/assets/logisticspipes/recipes/chip/chip_fpga_raw.json rename to src/main/resources/assets/logisticspipes/recipes/chip/chip_fpga_raw.json diff --git a/resources/assets/logisticspipes/recipes/crafting_table.json b/src/main/resources/assets/logisticspipes/recipes/crafting_table.json similarity index 100% rename from resources/assets/logisticspipes/recipes/crafting_table.json rename to src/main/resources/assets/logisticspipes/recipes/crafting_table.json diff --git a/resources/assets/logisticspipes/recipes/crafting_table_fuzzy.json b/src/main/resources/assets/logisticspipes/recipes/crafting_table_fuzzy.json similarity index 100% rename from resources/assets/logisticspipes/recipes/crafting_table_fuzzy.json rename to src/main/resources/assets/logisticspipes/recipes/crafting_table_fuzzy.json diff --git a/resources/assets/logisticspipes/recipes/disk.json b/src/main/resources/assets/logisticspipes/recipes/disk.json similarity index 100% rename from resources/assets/logisticspipes/recipes/disk.json rename to src/main/resources/assets/logisticspipes/recipes/disk.json diff --git a/resources/assets/logisticspipes/recipes/guide_book.json b/src/main/resources/assets/logisticspipes/recipes/guide_book.json similarity index 100% rename from resources/assets/logisticspipes/recipes/guide_book.json rename to src/main/resources/assets/logisticspipes/recipes/guide_book.json diff --git a/resources/assets/logisticspipes/recipes/logistics_programmer.json b/src/main/resources/assets/logisticspipes/recipes/logistics_programmer.json similarity index 100% rename from resources/assets/logisticspipes/recipes/logistics_programmer.json rename to src/main/resources/assets/logisticspipes/recipes/logistics_programmer.json diff --git a/resources/assets/logisticspipes/recipes/module_blank.json b/src/main/resources/assets/logisticspipes/recipes/module_blank.json similarity index 100% rename from resources/assets/logisticspipes/recipes/module_blank.json rename to src/main/resources/assets/logisticspipes/recipes/module_blank.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_basic.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_basic.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_basic.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_basic.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_hs_curve.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_curve.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_hs_curve.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_curve.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_hs_gain.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_gain.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_hs_gain.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_gain.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_hs_line.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_line.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_hs_line.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_line.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_hs_s_curve.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_s_curve.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_hs_s_curve.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_s_curve.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_hs_speedup.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_speedup.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_hs_speedup.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_hs_speedup.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_request_table.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_request_table.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_request_table.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_request_table.json diff --git a/resources/assets/logisticspipes/recipes/pipe/pipe_transport_basic.json b/src/main/resources/assets/logisticspipes/recipes/pipe/pipe_transport_basic.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe/pipe_transport_basic.json rename to src/main/resources/assets/logisticspipes/recipes/pipe/pipe_transport_basic.json diff --git a/resources/assets/logisticspipes/recipes/pipe_controller.json b/src/main/resources/assets/logisticspipes/recipes/pipe_controller.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe_controller.json rename to src/main/resources/assets/logisticspipes/recipes/pipe_controller.json diff --git a/resources/assets/logisticspipes/recipes/pipe_manager.json b/src/main/resources/assets/logisticspipes/recipes/pipe_manager.json similarity index 100% rename from resources/assets/logisticspipes/recipes/pipe_manager.json rename to src/main/resources/assets/logisticspipes/recipes/pipe_manager.json diff --git a/resources/assets/logisticspipes/recipes/power_junction.json b/src/main/resources/assets/logisticspipes/recipes/power_junction.json similarity index 100% rename from resources/assets/logisticspipes/recipes/power_junction.json rename to src/main/resources/assets/logisticspipes/recipes/power_junction.json diff --git a/resources/assets/logisticspipes/recipes/program_compiler.json b/src/main/resources/assets/logisticspipes/recipes/program_compiler.json similarity index 100% rename from resources/assets/logisticspipes/recipes/program_compiler.json rename to src/main/resources/assets/logisticspipes/recipes/program_compiler.json diff --git a/resources/assets/logisticspipes/recipes/remote_orderer.json b/src/main/resources/assets/logisticspipes/recipes/remote_orderer.json similarity index 100% rename from resources/assets/logisticspipes/recipes/remote_orderer.json rename to src/main/resources/assets/logisticspipes/recipes/remote_orderer.json diff --git a/resources/assets/logisticspipes/recipes/security_station.json b/src/main/resources/assets/logisticspipes/recipes/security_station.json similarity index 100% rename from resources/assets/logisticspipes/recipes/security_station.json rename to src/main/resources/assets/logisticspipes/recipes/security_station.json diff --git a/resources/assets/logisticspipes/recipes/sign_creator.json b/src/main/resources/assets/logisticspipes/recipes/sign_creator.json similarity index 100% rename from resources/assets/logisticspipes/recipes/sign_creator.json rename to src/main/resources/assets/logisticspipes/recipes/sign_creator.json diff --git a/resources/assets/logisticspipes/recipes/statistics_table.json b/src/main/resources/assets/logisticspipes/recipes/statistics_table.json similarity index 100% rename from resources/assets/logisticspipes/recipes/statistics_table.json rename to src/main/resources/assets/logisticspipes/recipes/statistics_table.json diff --git a/resources/assets/logisticspipes/textures/armor/logisticshud_1.png b/src/main/resources/assets/logisticspipes/textures/armor/logisticshud_1.png similarity index 100% rename from resources/assets/logisticspipes/textures/armor/logisticshud_1.png rename to src/main/resources/assets/logisticspipes/textures/armor/logisticshud_1.png diff --git a/resources/assets/logisticspipes/textures/blocks/blank_pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/blank_pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/blank_pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/blank_pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/empty.png b/src/main/resources/assets/logisticspipes/textures/blocks/empty.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/empty.png rename to src/main/resources/assets/logisticspipes/textures/blocks/empty.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/glass_texture_center.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/glass_texture_center.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/glass_texture_center.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/glass_texture_center.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/hs-speedup.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-speedup.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/hs-speedup.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-speedup.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube-line.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube-line.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/hs-tube-line.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube-line.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/hs-tube.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/hs-tube.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/innerbox.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/innerbox.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/innerbox.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/innerbox.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/liquid_connector.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/liquid_connector.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/liquid_connector.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/liquid_connector.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/analyzer.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/analyzer.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/analyzer.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/analyzer.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/beesink.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/beesink.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/beesink.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/beesink.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk1.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk1.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk1.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk1.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk2.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk2.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk3.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk3.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk3.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk3.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk4.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk4.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk4.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk4.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk5.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk5.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk5.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/chassi/chassi_mk5.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk2.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk2.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk3.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk3.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk3.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/crafting_mk3.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/destination.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/destination.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/destination.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/destination.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/entrance.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/entrance.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/entrance.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/entrance.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/firewall.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/firewall.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/firewall.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/firewall.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_con.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_con.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_con.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_con.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_dis.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_dis.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_dis.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_dis.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_mis.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_mis.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_mis.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/invsyscon_mis.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_extractor.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_extractor.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_extractor.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_extractor.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_insertion.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_insertion.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_insertion.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_insertion.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_provider.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_provider.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_provider.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_provider.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_request.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_request.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_request.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_request.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_satellite.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_satellite.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_satellite.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_satellite.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier_mk2.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier_mk2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_supplier_mk2.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_terminus.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_terminus.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_terminus.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/liquid_terminus.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider_mk2.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider_mk2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/provider_mk2.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/remote_orderer.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/remote_orderer.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/remote_orderer.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/remote_orderer.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request_mk2.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request_mk2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/request_mk2.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/satellite.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/satellite.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/satellite.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/satellite.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/supplier.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/supplier.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/supplier.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/supplier.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/transport/basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/transport/basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/new_texture/transport/basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/new_texture/transport/basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/analyzer/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/basic/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/beesink/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk1/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk2/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk3/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk4/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/chassi_mk5/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/direction/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/not_routed/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/chassi/status_overlay/routed/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk2/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/crafting_mk3/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/destination/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/entrance/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/firewall/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_con/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_dis/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/invsyscon_mis/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_basic/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_extractor/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_insertion/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_provider/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_request/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_satellite/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_supplier_mk2/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/liquid_terminus/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/provider_mk2/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/remote_orderer/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/request_mk2/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/satellite/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/not_routed/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/status_overlay/routed/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/supplier/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/transport/basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/transport/basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/transport/basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/overlay_gen/transport/basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-inactive.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-inactive.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-inactive.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-inactive.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status-bc.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status-bc.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status-bc.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status-bc.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel-status.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/pipemodel.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/pipemodel.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/direction_powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/direction_powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/direction_powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/direction_powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection_powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection_powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection_powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/liquid_connection_powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed_powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed_powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed_powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/not_routed_powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/opaque.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/opaque.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/opaque.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/opaque.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered_powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered_powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered_powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/powered_powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed_powered.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed_powered.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed_powered.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/routed_powered.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/security.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/security.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/security.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/security.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/subpower.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/subpower.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/subpower.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/subpower.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-overlayed.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-overlayed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-overlayed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-overlayed.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-powered-pipe.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-powered-pipe.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-powered-pipe.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/status_overlay/un-powered-pipe.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-active.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-active.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-active.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-active.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-inactive.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-inactive.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-inactive.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/thermaldynamicsconnection-inactive.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/transport/basic.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/transport/basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/transport/basic.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/transport/basic.png diff --git a/resources/assets/logisticspipes/textures/blocks/pipes/white.png b/src/main/resources/assets/logisticspipes/textures/blocks/pipes/white.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/pipes/white.png rename to src/main/resources/assets/logisticspipes/textures/blocks/pipes/white.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/0.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/0.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/0.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/0.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/1.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/1.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/1.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/1.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/2.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/2.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/3.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/3.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/3.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/3.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/4.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/4.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/4.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/4.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/requesttexture.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/requesttexture.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/requesttexture.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/requesttexture.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/routed.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/routed.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/routed.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/routed.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/routed_2.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/routed_2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/routed_2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/routed_2.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/unrouted.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted.png diff --git a/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted_2.png b/src/main/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted_2.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/requesttable/unrouted_2.png rename to src/main/resources/assets/logisticspipes/textures/blocks/requesttable/unrouted_2.png diff --git a/resources/assets/logisticspipes/textures/blocks/sideselection.png b/src/main/resources/assets/logisticspipes/textures/blocks/sideselection.png similarity index 100% rename from resources/assets/logisticspipes/textures/blocks/sideselection.png rename to src/main/resources/assets/logisticspipes/textures/blocks/sideselection.png diff --git a/resources/assets/logisticspipes/textures/gui/blue.png b/src/main/resources/assets/logisticspipes/textures/gui/blue.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/blue.png rename to src/main/resources/assets/logisticspipes/textures/gui/blue.png diff --git a/resources/assets/logisticspipes/textures/gui/checkbox-on-mouse.png b/src/main/resources/assets/logisticspipes/textures/gui/checkbox-on-mouse.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/checkbox-on-mouse.png rename to src/main/resources/assets/logisticspipes/textures/gui/checkbox-on-mouse.png diff --git a/resources/assets/logisticspipes/textures/gui/checkbox-on.png b/src/main/resources/assets/logisticspipes/textures/gui/checkbox-on.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/checkbox-on.png rename to src/main/resources/assets/logisticspipes/textures/gui/checkbox-on.png diff --git a/resources/assets/logisticspipes/textures/gui/checkbox-out-mouse.png b/src/main/resources/assets/logisticspipes/textures/gui/checkbox-out-mouse.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/checkbox-out-mouse.png rename to src/main/resources/assets/logisticspipes/textures/gui/checkbox-out-mouse.png diff --git a/resources/assets/logisticspipes/textures/gui/checkbox-out.png b/src/main/resources/assets/logisticspipes/textures/gui/checkbox-out.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/checkbox-out.png rename to src/main/resources/assets/logisticspipes/textures/gui/checkbox-out.png diff --git a/resources/assets/logisticspipes/textures/gui/crafting.png b/src/main/resources/assets/logisticspipes/textures/gui/crafting.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/crafting.png rename to src/main/resources/assets/logisticspipes/textures/gui/crafting.png diff --git a/resources/assets/logisticspipes/textures/gui/dark.png b/src/main/resources/assets/logisticspipes/textures/gui/dark.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/dark.png rename to src/main/resources/assets/logisticspipes/textures/gui/dark.png diff --git a/resources/assets/logisticspipes/textures/gui/filter.png b/src/main/resources/assets/logisticspipes/textures/gui/filter.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/filter.png rename to src/main/resources/assets/logisticspipes/textures/gui/filter.png diff --git a/resources/assets/logisticspipes/textures/gui/gui.png b/src/main/resources/assets/logisticspipes/textures/gui/gui.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/gui.png rename to src/main/resources/assets/logisticspipes/textures/gui/gui.png diff --git a/resources/assets/logisticspipes/textures/gui/gui_border.png b/src/main/resources/assets/logisticspipes/textures/gui/gui_border.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/gui_border.png rename to src/main/resources/assets/logisticspipes/textures/gui/gui_border.png diff --git a/resources/assets/logisticspipes/textures/gui/guibackground.png b/src/main/resources/assets/logisticspipes/textures/gui/guibackground.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/guibackground.png rename to src/main/resources/assets/logisticspipes/textures/gui/guibackground.png diff --git a/resources/assets/logisticspipes/textures/gui/guide_book.png b/src/main/resources/assets/logisticspipes/textures/gui/guide_book.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/guide_book.png rename to src/main/resources/assets/logisticspipes/textures/gui/guide_book.png diff --git a/resources/assets/logisticspipes/textures/gui/guide_book_404.png b/src/main/resources/assets/logisticspipes/textures/gui/guide_book_404.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/guide_book_404.png rename to src/main/resources/assets/logisticspipes/textures/gui/guide_book_404.png diff --git a/resources/assets/logisticspipes/textures/gui/itemsink.png b/src/main/resources/assets/logisticspipes/textures/gui/itemsink.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/itemsink.png rename to src/main/resources/assets/logisticspipes/textures/gui/itemsink.png diff --git a/resources/assets/logisticspipes/textures/gui/light.png b/src/main/resources/assets/logisticspipes/textures/gui/light.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/light.png rename to src/main/resources/assets/logisticspipes/textures/gui/light.png diff --git a/resources/assets/logisticspipes/textures/gui/lines.png b/src/main/resources/assets/logisticspipes/textures/gui/lines.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/lines.png rename to src/main/resources/assets/logisticspipes/textures/gui/lines.png diff --git a/resources/assets/logisticspipes/textures/gui/lock.png b/src/main/resources/assets/logisticspipes/textures/gui/lock.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/lock.png rename to src/main/resources/assets/logisticspipes/textures/gui/lock.png diff --git a/resources/assets/logisticspipes/textures/gui/logic_connection.png b/src/main/resources/assets/logisticspipes/textures/gui/logic_connection.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/logic_connection.png rename to src/main/resources/assets/logisticspipes/textures/gui/logic_connection.png diff --git a/resources/assets/logisticspipes/textures/gui/normal.png b/src/main/resources/assets/logisticspipes/textures/gui/normal.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/normal.png rename to src/main/resources/assets/logisticspipes/textures/gui/normal.png diff --git a/resources/assets/logisticspipes/textures/gui/power_junction.png b/src/main/resources/assets/logisticspipes/textures/gui/power_junction.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/power_junction.png rename to src/main/resources/assets/logisticspipes/textures/gui/power_junction.png diff --git a/resources/assets/logisticspipes/textures/gui/slot-big.png b/src/main/resources/assets/logisticspipes/textures/gui/slot-big.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/slot-big.png rename to src/main/resources/assets/logisticspipes/textures/gui/slot-big.png diff --git a/resources/assets/logisticspipes/textures/gui/slot-small.png b/src/main/resources/assets/logisticspipes/textures/gui/slot-small.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/slot-small.png rename to src/main/resources/assets/logisticspipes/textures/gui/slot-small.png diff --git a/resources/assets/logisticspipes/textures/gui/slot.png b/src/main/resources/assets/logisticspipes/textures/gui/slot.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/slot.png rename to src/main/resources/assets/logisticspipes/textures/gui/slot.png diff --git a/resources/assets/logisticspipes/textures/gui/slot_disk.png b/src/main/resources/assets/logisticspipes/textures/gui/slot_disk.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/slot_disk.png rename to src/main/resources/assets/logisticspipes/textures/gui/slot_disk.png diff --git a/resources/assets/logisticspipes/textures/gui/slot_programmer.png b/src/main/resources/assets/logisticspipes/textures/gui/slot_programmer.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/slot_programmer.png rename to src/main/resources/assets/logisticspipes/textures/gui/slot_programmer.png diff --git a/resources/assets/logisticspipes/textures/gui/sneaky.png b/src/main/resources/assets/logisticspipes/textures/gui/sneaky.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/sneaky.png rename to src/main/resources/assets/logisticspipes/textures/gui/sneaky.png diff --git a/resources/assets/logisticspipes/textures/gui/soldering_station.png b/src/main/resources/assets/logisticspipes/textures/gui/soldering_station.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/soldering_station.png rename to src/main/resources/assets/logisticspipes/textures/gui/soldering_station.png diff --git a/resources/assets/logisticspipes/textures/gui/soldering_station_nei.png b/src/main/resources/assets/logisticspipes/textures/gui/soldering_station_nei.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/soldering_station_nei.png rename to src/main/resources/assets/logisticspipes/textures/gui/soldering_station_nei.png diff --git a/resources/assets/logisticspipes/textures/gui/stats.png b/src/main/resources/assets/logisticspipes/textures/gui/stats.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/stats.png rename to src/main/resources/assets/logisticspipes/textures/gui/stats.png diff --git a/resources/assets/logisticspipes/textures/gui/supplier.png b/src/main/resources/assets/logisticspipes/textures/gui/supplier.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/supplier.png rename to src/main/resources/assets/logisticspipes/textures/gui/supplier.png diff --git a/resources/assets/logisticspipes/textures/gui/upgrade_manager.png b/src/main/resources/assets/logisticspipes/textures/gui/upgrade_manager.png similarity index 100% rename from resources/assets/logisticspipes/textures/gui/upgrade_manager.png rename to src/main/resources/assets/logisticspipes/textures/gui/upgrade_manager.png diff --git a/resources/assets/logisticspipes/textures/items/broken_item.png b/src/main/resources/assets/logisticspipes/textures/items/broken_item.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/broken_item.png rename to src/main/resources/assets/logisticspipes/textures/items/broken_item.png diff --git a/resources/assets/logisticspipes/textures/items/chip/advanced.png b/src/main/resources/assets/logisticspipes/textures/items/chip/advanced.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/advanced.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/advanced.png diff --git a/resources/assets/logisticspipes/textures/items/chip/advanced_raw.png b/src/main/resources/assets/logisticspipes/textures/items/chip/advanced_raw.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/advanced_raw.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/advanced_raw.png diff --git a/resources/assets/logisticspipes/textures/items/chip/basic.png b/src/main/resources/assets/logisticspipes/textures/items/chip/basic.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/basic.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/basic.png diff --git a/resources/assets/logisticspipes/textures/items/chip/basic_raw.png b/src/main/resources/assets/logisticspipes/textures/items/chip/basic_raw.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/basic_raw.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/basic_raw.png diff --git a/resources/assets/logisticspipes/textures/items/chip/fpga.png b/src/main/resources/assets/logisticspipes/textures/items/chip/fpga.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/fpga.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/fpga.png diff --git a/resources/assets/logisticspipes/textures/items/chip/fpga_raw.png b/src/main/resources/assets/logisticspipes/textures/items/chip/fpga_raw.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/chip/fpga_raw.png rename to src/main/resources/assets/logisticspipes/textures/items/chip/fpga_raw.png diff --git a/resources/assets/logisticspipes/textures/items/disk.png b/src/main/resources/assets/logisticspipes/textures/items/disk.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/disk.png rename to src/main/resources/assets/logisticspipes/textures/items/disk.png diff --git a/resources/assets/logisticspipes/textures/items/eastereggs/guipsp.png b/src/main/resources/assets/logisticspipes/textures/items/eastereggs/guipsp.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/eastereggs/guipsp.png rename to src/main/resources/assets/logisticspipes/textures/items/eastereggs/guipsp.png diff --git a/resources/assets/logisticspipes/textures/items/guide_book.png b/src/main/resources/assets/logisticspipes/textures/items/guide_book.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/guide_book.png rename to src/main/resources/assets/logisticspipes/textures/items/guide_book.png diff --git a/resources/assets/logisticspipes/textures/items/hud_glasses.png b/src/main/resources/assets/logisticspipes/textures/items/hud_glasses.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/hud_glasses.png rename to src/main/resources/assets/logisticspipes/textures/items/hud_glasses.png diff --git a/resources/assets/logisticspipes/textures/items/item_card.png b/src/main/resources/assets/logisticspipes/textures/items/item_card.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/item_card.png rename to src/main/resources/assets/logisticspipes/textures/items/item_card.png diff --git a/resources/assets/logisticspipes/textures/items/liquids/empty.png b/src/main/resources/assets/logisticspipes/textures/items/liquids/empty.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/liquids/empty.png rename to src/main/resources/assets/logisticspipes/textures/items/liquids/empty.png diff --git a/resources/assets/logisticspipes/textures/items/liquids/stencil.png b/src/main/resources/assets/logisticspipes/textures/items/liquids/stencil.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/liquids/stencil.png rename to src/main/resources/assets/logisticspipes/textures/items/liquids/stencil.png diff --git a/resources/assets/logisticspipes/textures/items/logistics_programmer.png b/src/main/resources/assets/logisticspipes/textures/items/logistics_programmer.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/logistics_programmer.png rename to src/main/resources/assets/logisticspipes/textures/items/logistics_programmer.png diff --git a/resources/assets/logisticspipes/textures/items/module/active_supplier.png b/src/main/resources/assets/logisticspipes/textures/items/module/active_supplier.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/active_supplier.png rename to src/main/resources/assets/logisticspipes/textures/items/module/active_supplier.png diff --git a/resources/assets/logisticspipes/textures/items/module/blank.png b/src/main/resources/assets/logisticspipes/textures/items/module/blank.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/blank.png rename to src/main/resources/assets/logisticspipes/textures/items/module/blank.png diff --git a/resources/assets/logisticspipes/textures/items/module/crafter.png b/src/main/resources/assets/logisticspipes/textures/items/module/crafter.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/crafter.png rename to src/main/resources/assets/logisticspipes/textures/items/module/crafter.png diff --git a/resources/assets/logisticspipes/textures/items/module/crafter_mk2.png b/src/main/resources/assets/logisticspipes/textures/items/module/crafter_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/crafter_mk2.png rename to src/main/resources/assets/logisticspipes/textures/items/module/crafter_mk2.png diff --git a/resources/assets/logisticspipes/textures/items/module/crafter_mk3.png b/src/main/resources/assets/logisticspipes/textures/items/module/crafter_mk3.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/crafter_mk3.png rename to src/main/resources/assets/logisticspipes/textures/items/module/crafter_mk3.png diff --git a/resources/assets/logisticspipes/textures/items/module/enchantment_sink.png b/src/main/resources/assets/logisticspipes/textures/items/module/enchantment_sink.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/enchantment_sink.png rename to src/main/resources/assets/logisticspipes/textures/items/module/enchantment_sink.png diff --git a/resources/assets/logisticspipes/textures/items/module/enchantment_sink_mk2.png b/src/main/resources/assets/logisticspipes/textures/items/module/enchantment_sink_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/enchantment_sink_mk2.png rename to src/main/resources/assets/logisticspipes/textures/items/module/enchantment_sink_mk2.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor_advanced.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor_advanced.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk2.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk2.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk2.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk3.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk3.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk3.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor_advanced_mk3.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor_mk2.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor_mk2.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor_mk2.png diff --git a/resources/assets/logisticspipes/textures/items/module/extractor_mk3.png b/src/main/resources/assets/logisticspipes/textures/items/module/extractor_mk3.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/extractor_mk3.png rename to src/main/resources/assets/logisticspipes/textures/items/module/extractor_mk3.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink_cc.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink_cc.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink_cc.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink_cc.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink_creativetab.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink_creativetab.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink_creativetab.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink_creativetab.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink_mod.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink_mod.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink_mod.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink_mod.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink_oredict.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink_oredict.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink_oredict.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink_oredict.png diff --git a/resources/assets/logisticspipes/textures/items/module/item_sink_polymorphic.png b/src/main/resources/assets/logisticspipes/textures/items/module/item_sink_polymorphic.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/item_sink_polymorphic.png rename to src/main/resources/assets/logisticspipes/textures/items/module/item_sink_polymorphic.png diff --git a/resources/assets/logisticspipes/textures/items/module/passive_supplier.png b/src/main/resources/assets/logisticspipes/textures/items/module/passive_supplier.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/passive_supplier.png rename to src/main/resources/assets/logisticspipes/textures/items/module/passive_supplier.png diff --git a/resources/assets/logisticspipes/textures/items/module/provider.png b/src/main/resources/assets/logisticspipes/textures/items/module/provider.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/provider.png rename to src/main/resources/assets/logisticspipes/textures/items/module/provider.png diff --git a/resources/assets/logisticspipes/textures/items/module/provider_mk2.png b/src/main/resources/assets/logisticspipes/textures/items/module/provider_mk2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/provider_mk2.png rename to src/main/resources/assets/logisticspipes/textures/items/module/provider_mk2.png diff --git a/resources/assets/logisticspipes/textures/items/module/quick_sort.png b/src/main/resources/assets/logisticspipes/textures/items/module/quick_sort.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/quick_sort.png rename to src/main/resources/assets/logisticspipes/textures/items/module/quick_sort.png diff --git a/resources/assets/logisticspipes/textures/items/module/quick_sort_cc.png b/src/main/resources/assets/logisticspipes/textures/items/module/quick_sort_cc.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/quick_sort_cc.png rename to src/main/resources/assets/logisticspipes/textures/items/module/quick_sort_cc.png diff --git a/resources/assets/logisticspipes/textures/items/module/terminus.png b/src/main/resources/assets/logisticspipes/textures/items/module/terminus.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/terminus.png rename to src/main/resources/assets/logisticspipes/textures/items/module/terminus.png diff --git a/resources/assets/logisticspipes/textures/items/module/thaumic_aspect_sink.png b/src/main/resources/assets/logisticspipes/textures/items/module/thaumic_aspect_sink.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/module/thaumic_aspect_sink.png rename to src/main/resources/assets/logisticspipes/textures/items/module/thaumic_aspect_sink.png diff --git a/resources/assets/logisticspipes/textures/items/parts/0.png b/src/main/resources/assets/logisticspipes/textures/items/parts/0.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/parts/0.png rename to src/main/resources/assets/logisticspipes/textures/items/parts/0.png diff --git a/resources/assets/logisticspipes/textures/items/parts/1.png b/src/main/resources/assets/logisticspipes/textures/items/parts/1.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/parts/1.png rename to src/main/resources/assets/logisticspipes/textures/items/parts/1.png diff --git a/resources/assets/logisticspipes/textures/items/parts/2.png b/src/main/resources/assets/logisticspipes/textures/items/parts/2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/parts/2.png rename to src/main/resources/assets/logisticspipes/textures/items/parts/2.png diff --git a/resources/assets/logisticspipes/textures/items/parts/3.png b/src/main/resources/assets/logisticspipes/textures/items/parts/3.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/parts/3.png rename to src/main/resources/assets/logisticspipes/textures/items/parts/3.png diff --git a/resources/assets/logisticspipes/textures/items/pipe_controller.png b/src/main/resources/assets/logisticspipes/textures/items/pipe_controller.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/pipe_controller.png rename to src/main/resources/assets/logisticspipes/textures/items/pipe_controller.png diff --git a/resources/assets/logisticspipes/textures/items/pipe_manager.png b/src/main/resources/assets/logisticspipes/textures/items/pipe_manager.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/pipe_manager.png rename to src/main/resources/assets/logisticspipes/textures/items/pipe_manager.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/0.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/0.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/0.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/0.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/1.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/1.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/1.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/1.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/10.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/10.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/10.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/10.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/11.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/11.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/11.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/11.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/12.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/12.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/12.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/12.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/13.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/13.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/13.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/13.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/14.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/14.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/14.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/14.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/15.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/15.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/15.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/15.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/16.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/16.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/16.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/16.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/2.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/2.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/2.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/2.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/3.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/3.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/3.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/3.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/4.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/4.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/4.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/4.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/5.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/5.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/5.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/5.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/6.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/6.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/6.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/6.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/7.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/7.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/7.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/7.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/8.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/8.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/8.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/8.png diff --git a/resources/assets/logisticspipes/textures/items/remote_orderer/9.png b/src/main/resources/assets/logisticspipes/textures/items/remote_orderer/9.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/remote_orderer/9.png rename to src/main/resources/assets/logisticspipes/textures/items/remote_orderer/9.png diff --git a/resources/assets/logisticspipes/textures/items/sign_creator.0.png b/src/main/resources/assets/logisticspipes/textures/items/sign_creator.0.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/sign_creator.0.png rename to src/main/resources/assets/logisticspipes/textures/items/sign_creator.0.png diff --git a/resources/assets/logisticspipes/textures/items/sign_creator.1.png b/src/main/resources/assets/logisticspipes/textures/items/sign_creator.1.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/sign_creator.1.png rename to src/main/resources/assets/logisticspipes/textures/items/sign_creator.1.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/action_speed.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/action_speed.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/action_speed.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/action_speed.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/cc_remote_control.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/cc_remote_control.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/cc_remote_control.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/cc_remote_control.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/crafting_byproduct.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_byproduct.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/crafting_byproduct.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_byproduct.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/crafting_cleanup.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_cleanup.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/crafting_cleanup.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_cleanup.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/crafting_monitoring.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_monitoring.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/crafting_monitoring.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/crafting_monitoring.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/disconnection.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/disconnection.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/disconnection.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/disconnection.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/fluid_crafting.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/fluid_crafting.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/fluid_crafting.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/fluid_crafting.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/fuzzy.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/fuzzy.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/fuzzy.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/fuzzy.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/item_extraction.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/item_extraction.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/item_extraction.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/item_extraction.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/item_stack_extraction.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/item_stack_extraction.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/item_stack_extraction.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/item_stack_extraction.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/module_upgrade.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/module_upgrade.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/module_upgrade.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/module_upgrade.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/opaque.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/opaque.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/opaque.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/opaque.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/pattern.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/pattern.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/pattern.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/pattern.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_ev.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_ev.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_ev.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_ev.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_hv.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_hv.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_hv.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_hv.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_lv.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_lv.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_lv.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_lv.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_mv.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_mv.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_mv.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_eu_mv.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_mj.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_mj.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_mj.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_mj.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_rf.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_rf.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_supplier_rf.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_supplier_rf.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/power_transportation.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/power_transportation.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/power_transportation.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/power_transportation.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/satellite_advanced.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/satellite_advanced.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/satellite_advanced.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/satellite_advanced.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/sneaky.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/sneaky.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/sneaky.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/sneaky.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/sneaky_combination.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/sneaky_combination.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/sneaky_combination.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/sneaky_combination.png diff --git a/resources/assets/logisticspipes/textures/items/upgrade/speed.png b/src/main/resources/assets/logisticspipes/textures/items/upgrade/speed.png similarity index 100% rename from resources/assets/logisticspipes/textures/items/upgrade/speed.png rename to src/main/resources/assets/logisticspipes/textures/items/upgrade/speed.png diff --git a/resources/assets/logisticspipes/textures/particles/laserball.png b/src/main/resources/assets/logisticspipes/textures/particles/laserball.png similarity index 100% rename from resources/assets/logisticspipes/textures/particles/laserball.png rename to src/main/resources/assets/logisticspipes/textures/particles/laserball.png diff --git a/resources/assets/logisticspipes/textures/particles/laserball.psd b/src/main/resources/assets/logisticspipes/textures/particles/laserball.psd similarity index 100% rename from resources/assets/logisticspipes/textures/particles/laserball.psd rename to src/main/resources/assets/logisticspipes/textures/particles/laserball.psd diff --git a/resources/assets/logisticspipes/textures/particles/laserbeam.png b/src/main/resources/assets/logisticspipes/textures/particles/laserbeam.png similarity index 100% rename from resources/assets/logisticspipes/textures/particles/laserbeam.png rename to src/main/resources/assets/logisticspipes/textures/particles/laserbeam.png diff --git a/resources/assets/logisticspipes/textures/particles/particles.png b/src/main/resources/assets/logisticspipes/textures/particles/particles.png similarity index 100% rename from resources/assets/logisticspipes/textures/particles/particles.png rename to src/main/resources/assets/logisticspipes/textures/particles/particles.png diff --git a/resources/assets/logisticspipes/textures/solid_block/crafting_table.png b/src/main/resources/assets/logisticspipes/textures/solid_block/crafting_table.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/crafting_table.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/crafting_table.png diff --git a/resources/assets/logisticspipes/textures/solid_block/crafting_table_fuzzy.png b/src/main/resources/assets/logisticspipes/textures/solid_block/crafting_table_fuzzy.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/crafting_table_fuzzy.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/crafting_table_fuzzy.png diff --git a/resources/assets/logisticspipes/textures/solid_block/frame.png b/src/main/resources/assets/logisticspipes/textures/solid_block/frame.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/frame.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/frame.png diff --git a/resources/assets/logisticspipes/textures/solid_block/power_junction.png b/src/main/resources/assets/logisticspipes/textures/solid_block/power_junction.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/power_junction.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/power_junction.png diff --git a/resources/assets/logisticspipes/textures/solid_block/power_provider_eu.png b/src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_eu.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/power_provider_eu.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_eu.png diff --git a/resources/assets/logisticspipes/textures/solid_block/power_provider_mj.png b/src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_mj.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/power_provider_mj.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_mj.png diff --git a/resources/assets/logisticspipes/textures/solid_block/power_provider_rf.png b/src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_rf.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/power_provider_rf.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/power_provider_rf.png diff --git a/resources/assets/logisticspipes/textures/solid_block/program_compiler.png b/src/main/resources/assets/logisticspipes/textures/solid_block/program_compiler.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/program_compiler.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/program_compiler.png diff --git a/resources/assets/logisticspipes/textures/solid_block/security_station.png b/src/main/resources/assets/logisticspipes/textures/solid_block/security_station.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/security_station.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/security_station.png diff --git a/resources/assets/logisticspipes/textures/solid_block/soldering_station.png b/src/main/resources/assets/logisticspipes/textures/solid_block/soldering_station.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/soldering_station.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/soldering_station.png diff --git a/resources/assets/logisticspipes/textures/solid_block/soldering_station_active.png b/src/main/resources/assets/logisticspipes/textures/solid_block/soldering_station_active.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/soldering_station_active.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/soldering_station_active.png diff --git a/resources/assets/logisticspipes/textures/solid_block/statistics_table.png b/src/main/resources/assets/logisticspipes/textures/solid_block/statistics_table.png similarity index 100% rename from resources/assets/logisticspipes/textures/solid_block/statistics_table.png rename to src/main/resources/assets/logisticspipes/textures/solid_block/statistics_table.png diff --git a/resources/logisticspipes/models/BlockModel_result.obj b/src/main/resources/logisticspipes/models/BlockModel_result.obj similarity index 100% rename from resources/logisticspipes/models/BlockModel_result.obj rename to src/main/resources/logisticspipes/models/BlockModel_result.obj diff --git a/resources/logisticspipes/models/HSTube-Gain_result.obj b/src/main/resources/logisticspipes/models/HSTube-Gain_result.obj similarity index 100% rename from resources/logisticspipes/models/HSTube-Gain_result.obj rename to src/main/resources/logisticspipes/models/HSTube-Gain_result.obj diff --git a/resources/logisticspipes/models/HSTube-Line_result.obj b/src/main/resources/logisticspipes/models/HSTube-Line_result.obj similarity index 100% rename from resources/logisticspipes/models/HSTube-Line_result.obj rename to src/main/resources/logisticspipes/models/HSTube-Line_result.obj diff --git a/resources/logisticspipes/models/HSTube-Speedup_result.obj b/src/main/resources/logisticspipes/models/HSTube-Speedup_result.obj similarity index 100% rename from resources/logisticspipes/models/HSTube-Speedup_result.obj rename to src/main/resources/logisticspipes/models/HSTube-Speedup_result.obj diff --git a/resources/logisticspipes/models/HSTube-Turn_result.obj b/src/main/resources/logisticspipes/models/HSTube-Turn_result.obj similarity index 100% rename from resources/logisticspipes/models/HSTube-Turn_result.obj rename to src/main/resources/logisticspipes/models/HSTube-Turn_result.obj diff --git a/resources/logisticspipes/models/PipeModel_Transport_Box.obj b/src/main/resources/logisticspipes/models/PipeModel_Transport_Box.obj similarity index 100% rename from resources/logisticspipes/models/PipeModel_Transport_Box.obj rename to src/main/resources/logisticspipes/models/PipeModel_Transport_Box.obj diff --git a/resources/logisticspipes/models/PipeModel_moved.obj b/src/main/resources/logisticspipes/models/PipeModel_moved.obj similarity index 100% rename from resources/logisticspipes/models/PipeModel_moved.obj rename to src/main/resources/logisticspipes/models/PipeModel_moved.obj diff --git a/resources/META-INF/lp_at.cfg b/src/main/resources/lp_at.cfg similarity index 100% rename from resources/META-INF/lp_at.cfg rename to src/main/resources/lp_at.cfg diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 0000000000..084532e163 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,34 @@ +[{ + "modid": "${mod_id}", + "name": "${mod_name}", + "version": "${mod_version}", + "mcversion": "1.12.2", + "description": "${mod_description}", + "authorList": ${mod_authors}, + "credits": "${mod_credits}", + "url": "${mod_url}", + "updateJSON": "${mod_update_json}", + "logoFile": "${mod_logo_path}", + "requiredMods": [ + "forge@[10.12.1.1079,)", + "codechickenlib@[3.1.7.340,)" + ], + "dependencies": [ + "forge@[10.12.1.1079,)", + "codechickenlib@[3.1.7.340,)", + "buildcraftcore", + "buildcrafttransport", + "buildcraftsilicon", + "buildcraftrobotics", + "ic2", + "computercraft", + "factorization", + "gregtech_addon", + "appliedenergistics", + "thermalexpansion", + "betterstorage", + "mcmultipart" + ], + "dependants": [], + "useDependencyInformation": true +}] diff --git a/resources/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from resources/pack.mcmeta rename to src/main/resources/pack.mcmeta diff --git a/src/test/kotlin/network/rs485/logisticspipes/integration/TestWorldBuilder.kt b/src/test/kotlin/network/rs485/logisticspipes/integration/TestWorldBuilder.kt index 08f53f6fdc..edd2cf2bdb 100644 --- a/src/test/kotlin/network/rs485/logisticspipes/integration/TestWorldBuilder.kt +++ b/src/test/kotlin/network/rs485/logisticspipes/integration/TestWorldBuilder.kt @@ -134,7 +134,7 @@ private fun WorldServer.setBlocksToAir(start: BlockPos, end: BlockPos) = blocksIn(start, end).forEach(::setBlockToAir) private fun WorldServer.removeItemsOnGround(start: BlockPos, end: BlockPos) = - blocksIn(start, end).map { getChunkFromBlockCoords(it) }.distinct() + blocksIn(start, end).map { getChunk(it) }.distinct() .forEach { chunk -> chunk.entityLists.flatMap { it.getByClass(EntityItem::class.java) }.forEach { removeEntity(it) } } diff --git a/src/test/kotlin/network/rs485/minecraft/BlockPosSelector.kt b/src/test/kotlin/network/rs485/minecraft/BlockPosSelector.kt index 3a7fae618a..7488822643 100644 --- a/src/test/kotlin/network/rs485/minecraft/BlockPosSelector.kt +++ b/src/test/kotlin/network/rs485/minecraft/BlockPosSelector.kt @@ -94,7 +94,7 @@ class BlockPosSelector(val worldBuilder: WorldBuilder) { val translated = worldBuilder.finalPosition(this@BlockPosSelector) val configurators = placersToOffsets.map { (translated + it.second).let { pos -> - worldBuilder.loadChunk(worldBuilder.world.getChunkFromBlockCoords(pos).pos) + worldBuilder.loadChunk(worldBuilder.world.getChunk(pos).pos) async { it.first.place(worldBuilder.world, pos) } diff --git a/tags.properties b/tags.properties new file mode 100644 index 0000000000..d795ef9dd8 --- /dev/null +++ b/tags.properties @@ -0,0 +1,3 @@ +VERSION = ${mod_version} +MOD_ID = ${mod_id} +MOD_NAME = ${mod_name} \ No newline at end of file