diff --git a/build.gradle.kts b/build.gradle.kts index 0737f13..66c4ab3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,13 +1,13 @@ import java.net.URI plugins { - `java-library` - eclipse - idea - `maven-publish` - id("io.freefair.lombok") version "8.6" - id ("net.neoforged.gradle.userdev") version ("7.0.142") - id("com.diffplug.spotless") version "7.0.0.BETA1" + `java-library` + eclipse + idea + `maven-publish` + id("io.freefair.lombok") version "8.6" + id ("net.neoforged.gradle.userdev") version ("7.0.142") + id("com.diffplug.spotless") version "7.0.0.BETA1" } val minecraftVersion: String by project @@ -33,32 +33,32 @@ version = modVersion group = modGroupId repositories { - mavenLocal() - maven { - url = URI.create("https://maven.k-4u.nl") - } - maven { - url = URI.create("https://maven.blamejared.com") - } + mavenLocal() + maven { + url = URI.create("https://maven.k-4u.nl") + } + maven { + url = URI.create("https://maven.blamejared.com") + } - maven { url = URI.create("https://maven.shedaniel.me/") } - maven { url = URI.create("https://maven.architectury.dev/") } + maven { url = URI.create("https://maven.shedaniel.me/") } + maven { url = URI.create("https://maven.architectury.dev/") } } base { - archivesName = modId + archivesName = modId } java.toolchain.languageVersion = JavaLanguageVersion.of(21) spotless { - format("misc") { - target("*.gradle.kts", ".gitattributes", ".gitignore") + format("misc") { + target("*.gradle.kts", ".gitattributes", ".gitignore") - trimTrailingWhitespace() - indentWithTabs() - endWithNewline() - } + trimTrailingWhitespace() + indentWithTabs() + endWithNewline() + } java { // Originally, this was from Kaupenjoe's repo, and was licensed by BluSunrize as the original code was from her, so we exclude it to not add our License Header @@ -72,30 +72,30 @@ spotless { sourceSets { - // Include resources generated by data generators. - main.configure { - resources { - srcDir("src/generated/resources") - } - } - create("junit") { - java { - } + // Include resources generated by data generators. + main.configure { + resources { + srcDir("src/generated/resources") + } + } + create("junit") { + java { + } - compileClasspath += sourceSets.main.get().output - runtimeClasspath += sourceSets.main.get().output + compileClasspath += sourceSets.main.get().output + runtimeClasspath += sourceSets.main.get().output - } + } } val junitImplementation: Configuration by configurations.getting { - extendsFrom(configurations.implementation.get()) + extendsFrom(configurations.implementation.get()) } val junitRuntimeOnly: Configuration by configurations.getting { - extendsFrom(configurations.runtimeOnly.get()) + extendsFrom(configurations.runtimeOnly.get()) } @@ -112,69 +112,69 @@ configurations["junitImplementation"].extendsFrom(configurations.implementation. // Default run configurations. // These can be tweaked, removed, or duplicated as needed. runs { - // applies to all the run configs below + // applies to all the run configs below - configureEach { - // Recommended logging data for an userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - systemProperty ("forge.logging.markers", "REGISTRIES") + configureEach { + // Recommended logging data for an userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty ("forge.logging.markers", "REGISTRIES") - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - systemProperty ("forge.logging.console.level", "debug") + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + systemProperty ("forge.logging.console.level", "debug") - modSource (project.sourceSets["main"]) - } + modSource (project.sourceSets["main"]) + } - create("junit") { - junit(true) + create("junit") { + junit(true) - unitTestSources(sourceSets["junit"]) - } + unitTestSources(sourceSets["junit"]) + } - create("client") { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - systemProperty ("forge.enabledGameTestNamespaces", modId) - } + create("client") { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty ("forge.enabledGameTestNamespaces", modId) + } - create("server") { - systemProperty ("forge.enabledGameTestNamespaces", modId) - programArgument ("--nogui") - } + create("server") { + systemProperty ("forge.enabledGameTestNamespaces", modId) + programArgument ("--nogui") + } - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - create("gameTestServer") { - systemProperty ("forge.enabledGameTestNamespaces", modId) + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + create("gameTestServer") { + systemProperty ("forge.enabledGameTestNamespaces", modId) - } + } - create("data") { - // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it - // workingDirectory project.file("run-data") + create("data") { + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // workingDirectory project.file("run-data") - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - programArguments.addAll ("--mod", modId, "--all", "--output", file("src/generated/resources/").absolutePath, "--existing", file("src/main/resources/").absolutePath) - } + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll ("--mod", modId, "--all", "--output", file("src/generated/resources/").absolutePath, "--existing", file("src/main/resources/").absolutePath) + } } dependencies { - // Specify the version of Minecraft to use. - // Depending on the plugin applied there are several options. We will assume you applied the userdev plugin as shown above. - // The group for userdev is net.neoforge, the module name is neoforge, and the version is the same as the neoforge version. - // You can however also use the vanilla plugin (net.neoforged.gradle.vanilla) to use a version of Minecraft without the neoforge loader. - // And its provides the option to then use net.minecraft as the group, and one of; client, server or joined as the module name, plus the game version as version. - // For all intends and purposes: You can treat this dependency as if it is a normal library you would use. - implementation ("net.neoforged:neoforge:${neoVersion}") + // Specify the version of Minecraft to use. + // Depending on the plugin applied there are several options. We will assume you applied the userdev plugin as shown above. + // The group for userdev is net.neoforge, the module name is neoforge, and the version is the same as the neoforge version. + // You can however also use the vanilla plugin (net.neoforged.gradle.vanilla) to use a version of Minecraft without the neoforge loader. + // And its provides the option to then use net.minecraft as the group, and one of; client, server or joined as the module name, plus the game version as version. + // For all intends and purposes: You can treat this dependency as if it is a normal library you would use. + implementation ("net.neoforged:neoforge:${neoVersion}") - // Wait until 1.20.6 has a stable neoforge version, so that all mods should work when updated + // Wait until 1.20.6 has a stable neoforge version, so that all mods should work when updated // implementation("mcjty.theoneprobe:theoneprobe:${topVersion}") // // runtimeOnly("me.shedaniel:RoughlyEnoughItems-neoforge:${reiVersion}") @@ -182,40 +182,40 @@ dependencies { // compileOnly("me.shedaniel:RoughlyEnoughItems-default-plugin-neoforge:${reiVersion}") - // Testing - junitImplementation(platform("org.junit:junit-bom:${junitVersion}")) - junitImplementation("org.junit.jupiter:junit-jupiter-params") - junitRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + // Testing + junitImplementation(platform("org.junit:junit-bom:${junitVersion}")) + junitImplementation("org.junit.jupiter:junit-jupiter-params") + junitRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - junitImplementation("org.assertj:assertj-core:${assertjVersion}") + junitImplementation("org.assertj:assertj-core:${assertjVersion}") - // Example mod dependency with JEI - // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + // Example mod dependency with JEI + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime // compileOnly("mezz.jei:jei-${minecraftVersion}-common-api:${jei_version}") // compileOnly("mezz.jei:jei-${minecraftVersion}-forge-api:${jei_version}") // runtimeOnly("mezz.jei:jei-${minecraftVersion}-forge:${jei_version}") - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation "blank:coolmod-${mc_version}:${coolmod_version}" + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // implementation "blank:coolmod-${mc_version}:${coolmod_version}" - // Example mod dependency using a file as dependency - // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar") + // Example mod dependency using a file as dependency + // implementation files("libs/coolmod-${mc_version}-${coolmod_version}.jar") - // Example project dependency using a sister or child project: - // implementation project(":myproject") + // Example project dependency using a sister or child project: + // implementation project(":myproject") - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html } afterEvaluate { // runs["junit"].modSources(runs["junit"].modSources) // runs["junit"].modSources = runs["junit"].modSources.get().stream().filter { it != sourceSets.main.get() }.toList() - runs["junit"].modSources.all().get().values().remove(sourceSets.main.get()) + runs["junit"].modSources.all().get().values().remove(sourceSets.main.get()) } @@ -225,49 +225,49 @@ afterEvaluate { // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.withType().configureEach { - val replaceProperties = mapOf( - "minecraft_version" to minecraftVersion, - "minecraft_version_range" to minecraftVersionRange, - "neo_version" to neoVersion, - "neo_version_range" to neoVersionRange, - "loader_version_range" to loaderVersionRange, - "mod_id" to modId, - "mod_name" to modName, - "mod_license" to modLicense, - "mod_version" to modVersion, - "mod_authors" to modAuthors, - "mod_description" to modDescription) - inputs.properties(replaceProperties) + val replaceProperties = mapOf( + "minecraft_version" to minecraftVersion, + "minecraft_version_range" to minecraftVersionRange, + "neo_version" to neoVersion, + "neo_version_range" to neoVersionRange, + "loader_version_range" to loaderVersionRange, + "mod_id" to modId, + "mod_name" to modName, + "mod_license" to modLicense, + "mod_version" to modVersion, + "mod_authors" to modAuthors, + "mod_description" to modDescription) + inputs.properties(replaceProperties) - filesMatching("META-INF/neoforge.mods.toml") { - expand(replaceProperties) - } + filesMatching("META-INF/neoforge.mods.toml") { + expand(replaceProperties) + } } // Example configuration to allow publishing using the maven-publish plugin publishing { - publications { - register("mavenJava") { - from (components["java"]) - } - } - repositories { + publications { + register("mavenJava") { + from (components["java"]) + } + } + repositories { - maven { - url = project.projectDir.toURI() - } - } + maven { + url = project.projectDir.toURI() + } + } } // IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. idea { - module { - isDownloadJavadoc = true - isDownloadSources = true - } + module { + isDownloadJavadoc = true + isDownloadSources = true + } } tasks.test { - useJUnitPlatform() -} \ No newline at end of file + useJUnitPlatform() +} diff --git a/settings.gradle.kts b/settings.gradle.kts index cf04d13..593404a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,11 +1,11 @@ pluginManagement { - repositories { - mavenLocal() - gradlePluginPortal() - maven ("https://maven.neoforged.net/releases") - } + repositories { + mavenLocal() + gradlePluginPortal() + maven ("https://maven.neoforged.net/releases") + } } plugins { - id ("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" + id ("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } diff --git a/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java b/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java index 0dcf83e..3250656 100644 --- a/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java +++ b/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java @@ -1,3 +1,9 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.unittest; diff --git a/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java b/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java index 40ffe27..132d2f7 100644 --- a/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java +++ b/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java @@ -1,6 +1,13 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.unittest; import org.junit.jupiter.api.Test; + import robaertschi.environmenttech.client.screen.ProgressArrowUtils; import static org.assertj.core.api.Assertions.*; diff --git a/src/main/java/robaertschi/environmenttech/Config.java b/src/main/java/robaertschi/environmenttech/Config.java index 4b233be..fe2d01f 100644 --- a/src/main/java/robaertschi/environmenttech/Config.java +++ b/src/main/java/robaertschi/environmenttech/Config.java @@ -1,3 +1,9 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech; import net.neoforged.bus.api.SubscribeEvent; diff --git a/src/main/java/robaertschi/environmenttech/EnvironmentTech.java b/src/main/java/robaertschi/environmenttech/EnvironmentTech.java index 0c6d7e1..a22c065 100644 --- a/src/main/java/robaertschi/environmenttech/EnvironmentTech.java +++ b/src/main/java/robaertschi/environmenttech/EnvironmentTech.java @@ -1,7 +1,11 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech; -import com.mojang.logging.LogUtils; -import net.minecraft.resources.ResourceLocation; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModContainer; @@ -11,6 +15,11 @@ import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.RegisterCommandsEvent; import net.neoforged.neoforge.event.tick.PlayerTickEvent; import org.slf4j.Logger; + +import net.minecraft.resources.ResourceLocation; + +import com.mojang.logging.LogUtils; + import robaertschi.environmenttech.command.EnvironmenttechCommand; import robaertschi.environmenttech.data.attachments.ETAttachments; import robaertschi.environmenttech.data.capabilities.ETCapabilities; diff --git a/src/main/java/robaertschi/environmenttech/client/ETClient.java b/src/main/java/robaertschi/environmenttech/client/ETClient.java index 54c3913..f671b55 100644 --- a/src/main/java/robaertschi/environmenttech/client/ETClient.java +++ b/src/main/java/robaertschi/environmenttech/client/ETClient.java @@ -1,14 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.client; -import com.mojang.blaze3d.platform.InputConstants; -import net.minecraft.client.KeyMapping; -import net.minecraft.client.renderer.item.ItemProperties; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.jarjar.nio.util.Lazy; import net.neoforged.neoforge.client.event.*; -import org.lwjgl.glfw.GLFW; + +import net.minecraft.client.renderer.item.ItemProperties; + import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.client.particle.EnvParticleProvider; import robaertschi.environmenttech.client.screen.EnvCollectorScreen; diff --git a/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java b/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java index c8ead13..0fdcf66 100644 --- a/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java +++ b/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java @@ -1,13 +1,22 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.client.particle; import lombok.AllArgsConstructor; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.Particle; import net.minecraft.client.particle.ParticleProvider; import net.minecraft.client.particle.SpriteSet; import net.minecraft.core.particles.SimpleParticleType; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + import robaertschi.environmenttech.level.particle.EnvParticle; @AllArgsConstructor() diff --git a/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java b/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java index 199d6d1..f6497e3 100644 --- a/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java +++ b/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java @@ -1,6 +1,13 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.client.renderer; import lombok.AllArgsConstructor; + import net.minecraft.client.gui.GuiGraphics; import net.minecraft.util.FastColor; diff --git a/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java b/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java index b4c0072..dbc8c78 100644 --- a/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java +++ b/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java @@ -1,11 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.client.screen; +import org.jetbrains.annotations.NotNull; + import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import org.jetbrains.annotations.NotNull; + import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; import robaertschi.environmenttech.menu.EnvCollectorMenu; diff --git a/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java b/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java index 870d987..b1f940c 100644 --- a/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java +++ b/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java @@ -1,6 +1,13 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.client.screen; import net.minecraft.resources.ResourceLocation; + import robaertschi.environmenttech.EnvironmentTech; public class ProgressArrowUtils { diff --git a/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java b/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java index 65c6a8a..38e3bbf 100644 --- a/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java +++ b/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java @@ -1,12 +1,20 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.command; -import com.mojang.brigadier.CommandDispatcher; -import com.mojang.brigadier.arguments.LongArgumentType; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkAccess; + +import com.mojang.brigadier.CommandDispatcher; +import com.mojang.brigadier.arguments.LongArgumentType; + import robaertschi.environmenttech.data.attachments.ETAttachments; import static net.minecraft.commands.Commands.*; diff --git a/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java b/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java index 7c58204..df5f592 100644 --- a/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java +++ b/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java @@ -1,13 +1,21 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.attachments; -import com.mojang.serialization.Codec; +import java.util.function.Supplier; + import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.attachment.AttachmentType; import net.neoforged.neoforge.registries.DeferredRegister; import net.neoforged.neoforge.registries.NeoForgeRegistries; -import robaertschi.environmenttech.EnvironmentTech; -import java.util.function.Supplier; +import com.mojang.serialization.Codec; + +import robaertschi.environmenttech.EnvironmentTech; public class ETAttachments { private static final DeferredRegister> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, EnvironmentTech.MODID); diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java b/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java index 94ce287..5231851 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java +++ b/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java @@ -1,10 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.capabilities; import lombok.AllArgsConstructor; -import net.minecraft.world.item.ItemStack; + import net.neoforged.neoforge.items.IItemHandlerModifiable; import org.jetbrains.annotations.NotNull; +import net.minecraft.world.item.ItemStack; + @AllArgsConstructor public class AdaptedItemHandler implements IItemHandlerModifiable { private final IItemHandlerModifiable handler; diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java b/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java index 48393e5..f2c83d2 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java +++ b/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java @@ -1,10 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.capabilities; -import net.minecraft.core.Direction; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.capabilities.BlockCapability; import net.neoforged.neoforge.capabilities.Capabilities; import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; + +import net.minecraft.core.Direction; + import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.level.block.entity.ETBlockEntities; diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java b/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java index 7e02b0e..0e92aa2 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java +++ b/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java @@ -1,3 +1,9 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.capabilities; import net.minecraft.util.Mth; diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java b/src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java index 632c33a..e8c2cab 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java +++ b/src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java @@ -1,3 +1,9 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.capabilities; public enum EnvType { diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java b/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java index f4f7542..41adbc1 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java +++ b/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java @@ -1,3 +1,9 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.capabilities; /** diff --git a/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java b/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java index 2780ac3..f4d9485 100644 --- a/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java +++ b/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java @@ -1,9 +1,17 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.components; -import net.minecraft.core.component.DataComponentType; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; + +import net.minecraft.core.component.DataComponentType; + import robaertschi.environmenttech.EnvironmentTech; public class ETComponents { diff --git a/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java b/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java index a6e3f8d..b101e61 100644 --- a/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java +++ b/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java @@ -1,10 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.components; +import io.netty.buffer.ByteBuf; + +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; + import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.netty.buffer.ByteBuf; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; public record FilledComponent(int filled) { public static final Codec CODEC = RecordCodecBuilder.create(filledComponentInstance -> diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java b/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java index 1779f03..5a78b6f 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java +++ b/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java @@ -1,11 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.recipes; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + import net.minecraft.core.registries.Registries; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java b/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java index e912730..4ad3ad8 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java +++ b/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java @@ -1,6 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.recipes; import lombok.RequiredArgsConstructor; + +import java.util.LinkedHashMap; +import java.util.Map; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.advancements.Advancement; import net.minecraft.advancements.AdvancementRequirements; import net.minecraft.advancements.AdvancementRewards; @@ -18,11 +31,6 @@ import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.LinkedHashMap; -import java.util.Map; public record EnvCollectorRecipe(Ingredient input, ItemStack output, int envUsed) implements Recipe { @Override diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java b/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java index 3a77c5d..ff48018 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java +++ b/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java @@ -1,14 +1,22 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.data.recipes; -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; +import org.jetbrains.annotations.NotNull; + import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.RecipeSerializer; -import org.jetbrains.annotations.NotNull; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; public class EnvCollectorRecipeSerializer implements RecipeSerializer { public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java b/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java index cbe7a55..ab08b3e 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java +++ b/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java @@ -1,9 +1,17 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.datagen; -import net.minecraft.data.PackOutput; import net.neoforged.neoforge.client.model.generators.BlockStateProvider; import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import net.minecraft.data.PackOutput; + import robaertschi.environmenttech.level.block.ETBlocks; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java b/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java index de9ef6d..9b9512e 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java +++ b/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java @@ -1,14 +1,21 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.datagen; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; +import java.util.concurrent.CompletableFuture; + import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; -import java.util.concurrent.CompletableFuture; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java b/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java index 53ab67f..23521be 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java +++ b/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java @@ -1,11 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.datagen; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.client.model.generators.ModelFile; import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; + import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.level.block.ETBlocks; import robaertschi.environmenttech.level.item.ETItems; diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java b/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java index 9ceb173..69661ae 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java +++ b/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java @@ -1,5 +1,16 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.datagen; +import java.util.concurrent.CompletableFuture; + +import net.neoforged.neoforge.common.Tags; +import org.jetbrains.annotations.NotNull; + import net.minecraft.advancements.critereon.InventoryChangeTrigger; import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.core.HolderLookup; @@ -11,14 +22,11 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -import net.neoforged.neoforge.common.Tags; -import org.jetbrains.annotations.NotNull; + import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; import robaertschi.environmenttech.level.item.ETItems; -import java.util.concurrent.CompletableFuture; - public class ETRecipeProvider extends RecipeProvider { public ETRecipeProvider(PackOutput pOutput, CompletableFuture pRegistries) { super(pOutput, pRegistries); diff --git a/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java b/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java index 475bc8a..20f59fb 100644 --- a/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java +++ b/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java @@ -1,11 +1,20 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level; import lombok.extern.slf4j.Slf4j; -import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraft.world.level.chunk.status.ChunkStatus; + import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.event.level.ChunkEvent; + +import net.minecraft.world.level.chunk.LevelChunk; +import net.minecraft.world.level.chunk.status.ChunkStatus; + import robaertschi.environmenttech.Config; import robaertschi.environmenttech.EnvironmentTech; import robaertschi.environmenttech.data.attachments.ETAttachments; diff --git a/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java b/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java index 0244414..a1d4b1d 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java +++ b/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java @@ -1,10 +1,17 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block; -import net.minecraft.world.level.block.state.BlockBehaviour; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredBlock; import net.neoforged.neoforge.registries.DeferredRegister; +import net.minecraft.world.level.block.state.BlockBehaviour; + import static robaertschi.environmenttech.EnvironmentTech.MODID; public class ETBlocks { diff --git a/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java b/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java index 7298017..353add2 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java +++ b/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java @@ -1,7 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block; -import com.mojang.serialization.MapCodec; import lombok.extern.slf4j.Slf4j; + +import javax.annotation.ParametersAreNonnullByDefault; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -27,13 +38,12 @@ import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + +import com.mojang.serialization.MapCodec; + import robaertschi.environmenttech.level.block.entity.ETBlockEntities; import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; -import javax.annotation.ParametersAreNonnullByDefault; - @ParametersAreNonnullByDefault() @Slf4j public class EnvCollectorBlock extends BaseEntityBlock { diff --git a/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java b/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java index 8d14a86..fcb534c 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java +++ b/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java @@ -1,7 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block; -import com.mojang.serialization.MapCodec; import lombok.extern.slf4j.Slf4j; + +import javax.annotation.ParametersAreNonnullByDefault; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -16,13 +27,12 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.DirectionProperty; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + +import com.mojang.serialization.MapCodec; + import robaertschi.environmenttech.level.block.entity.ETBlockEntities; import robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity; -import javax.annotation.ParametersAreNonnullByDefault; - @SuppressWarnings("deprecation") @Slf4j @ParametersAreNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java b/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java index 35cd784..60e4bac 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java +++ b/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java @@ -1,12 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block.entity; -import net.minecraft.core.registries.Registries; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; + +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.block.entity.BlockEntityType; + import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.level.block.EnvDistributorBlock; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java b/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java index 960693f..b073e5c 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java +++ b/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java @@ -1,6 +1,22 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block.entity; import lombok.Getter; + +import net.neoforged.jarjar.nio.util.Lazy; +import net.neoforged.neoforge.items.IItemHandler; +import net.neoforged.neoforge.items.IItemHandlerModifiable; +import net.neoforged.neoforge.items.ItemStackHandler; +import net.neoforged.neoforge.items.wrapper.CombinedInvWrapper; +import net.neoforged.neoforge.items.wrapper.RecipeWrapper; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; @@ -20,14 +36,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import net.neoforged.jarjar.nio.util.Lazy; -import net.neoforged.neoforge.items.IItemHandler; -import net.neoforged.neoforge.items.IItemHandlerModifiable; -import net.neoforged.neoforge.items.ItemStackHandler; -import net.neoforged.neoforge.items.wrapper.CombinedInvWrapper; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; + import robaertschi.environmenttech.data.attachments.ETAttachments; import robaertschi.environmenttech.data.capabilities.AdaptedItemHandler; import robaertschi.environmenttech.data.capabilities.EnvStorage; diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java b/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java index 124fdae..7833c53 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java +++ b/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java @@ -1,22 +1,28 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block.entity; import lombok.Getter; + +import javax.annotation.ParametersAreNonnullByDefault; + +import org.jetbrains.annotations.NotNull; + import net.minecraft.core.BlockPos; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; -import net.minecraft.util.Mth; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import org.jetbrains.annotations.NotNull; + import robaertschi.environmenttech.data.attachments.ETAttachments; import robaertschi.environmenttech.data.capabilities.EnvStorage; import robaertschi.environmenttech.data.capabilities.EnvType; -import robaertschi.environmenttech.data.components.ETComponents; - -import javax.annotation.ParametersAreNonnullByDefault; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java b/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java index 40ded90..7c496a2 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java +++ b/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java @@ -1,7 +1,14 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.block.entity.renderer; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Axis; +import java.util.Objects; +import javax.annotation.ParametersAreNonnullByDefault; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; @@ -16,13 +23,14 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.LightLayer; import net.minecraft.world.phys.Vec3; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.math.Axis; + import robaertschi.environmenttech.level.block.EnvCollectorBlock; import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; import robaertschi.environmenttech.level.particle.ETParticles; -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.Objects; - @ParametersAreNonnullByDefault public class EnvCollectorRenderer implements BlockEntityRenderer { @SuppressWarnings("unused") diff --git a/src/main/java/robaertschi/environmenttech/level/item/ETItems.java b/src/main/java/robaertschi/environmenttech/level/item/ETItems.java index 8ef4e5a..6483492 100644 --- a/src/main/java/robaertschi/environmenttech/level/item/ETItems.java +++ b/src/main/java/robaertschi/environmenttech/level/item/ETItems.java @@ -1,5 +1,16 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.item; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredItem; +import net.neoforged.neoforge.registries.DeferredRegister; + import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; @@ -8,10 +19,7 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.component.CustomModelData; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; -import net.neoforged.neoforge.registries.DeferredRegister; + import robaertschi.environmenttech.level.block.ETBlocks; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java b/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java index a5a21d2..eb843a6 100644 --- a/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java +++ b/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java @@ -1,5 +1,16 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.item; +import java.util.List; +import javax.annotation.ParametersAreNonnullByDefault; + +import org.jetbrains.annotations.NotNull; + import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; @@ -9,14 +20,11 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; + import robaertschi.environmenttech.data.attachments.ETAttachments; import robaertschi.environmenttech.data.components.ETComponents; import robaertschi.environmenttech.data.components.FilledComponent; -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.List; - @ParametersAreNonnullByDefault public class EnvDetectorItem extends Item { public static final int STEPS = 9; diff --git a/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java b/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java index f79fd37..b671db7 100644 --- a/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java +++ b/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java @@ -1,11 +1,18 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.particle; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.core.registries.BuiltInRegistries; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; import static robaertschi.environmenttech.EnvironmentTech.MODID; diff --git a/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java b/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java index 4fcd3ba..7467ec7 100644 --- a/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java +++ b/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java @@ -1,12 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.level.particle; +import org.jetbrains.annotations.NotNull; + import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.ParticleRenderType; import net.minecraft.client.particle.SpriteSet; import net.minecraft.client.particle.TextureSheetParticle; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; -import org.jetbrains.annotations.NotNull; public class EnvParticle extends TextureSheetParticle implements ParticleOptions { private final SpriteSet spriteSet; diff --git a/src/main/java/robaertschi/environmenttech/menu/ETMenus.java b/src/main/java/robaertschi/environmenttech/menu/ETMenus.java index 2cb5a5b..43ae13a 100644 --- a/src/main/java/robaertschi/environmenttech/menu/ETMenus.java +++ b/src/main/java/robaertschi/environmenttech/menu/ETMenus.java @@ -1,12 +1,19 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.menu; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.inventory.MenuType; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; import net.neoforged.neoforge.registries.DeferredHolder; import net.neoforged.neoforge.registries.DeferredRegister; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.inventory.MenuType; + import static robaertschi.environmenttech.EnvironmentTech.MODID; public class ETMenus { diff --git a/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java b/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java index 4b8a2da..271b916 100644 --- a/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java +++ b/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java @@ -1,14 +1,23 @@ +/* + * EnvironmentTech Copyright (C) 2024 Robin B??rtschi + * This program comes with ABSOLUTELY NO WARRANTY; for details open the file LICENSE at the root of the source code. + * This is free software, and you are welcome to redistribute it + * under certain conditions; read the LICENSE file at the root of the source code for details. + */ package robaertschi.environmenttech.menu; import lombok.Getter; + +import net.neoforged.neoforge.items.SlotItemHandler; +import org.jetbrains.annotations.NotNull; + import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.*; import net.minecraft.world.item.ItemStack; -import net.neoforged.neoforge.items.SlotItemHandler; -import org.jetbrains.annotations.NotNull; + import robaertschi.environmenttech.level.block.ETBlocks; import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;