diff --git a/COPYING b/COPYING index 04d4f18..929627e 100644 --- a/COPYING +++ b/COPYING @@ -6,11 +6,12 @@ Some code might have a different license, if this is true, then there will be a Other Licenses: - src - main - - robaertschi - - environmenttech - - client - - renderer - - EnvStorageRenderer.java = Blu's License of Common Sense - - RenderUtils.java = LGPL-3.0 - - utils - - MouseUtils.java = MIT + - xyz + - robaertschi + - environmenttech + - client + - renderer + - EnvStorageRenderer.java = Blu's License of Common Sense + - RenderUtils.java = LGPL-3.0 + - utils + - MouseUtils.java = MIT diff --git a/build.gradle.kts b/build.gradle.kts index 904d42d..a24d2d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -103,11 +103,11 @@ spotless { 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 targetExclude( - "src/main/java/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java", - "src/main/java/robaertschi/environmenttech/utils/MouseUtils.java", - "src/main/java/robaertschi/environmenttech/client/RenderUtils.java" + "src/main/java/xyz/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java", + "src/main/java/xyz/robaertschi/environmenttech/utils/MouseUtils.java", + "src/main/java/xyz/robaertschi/environmenttech/client/RenderUtils.java" ) - importOrder("lombok", "java|javax", "", "net.minecraft", "com.mojang", "robaertschi", "\\#") + importOrder("lombok", "java|javax", "", "net.minecraft", "com.mojang", "xyz.robaertschi", "\\#") removeUnusedImports() licenseHeaderFile("HEADER.java") } diff --git a/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java b/src/junit/java/xyz/robaertschi/environmenttech/unittest/TestMod.java similarity index 94% rename from src/junit/java/robaertschi/environmenttech/unittest/TestMod.java rename to src/junit/java/xyz/robaertschi/environmenttech/unittest/TestMod.java index 256f2b1..ccea470 100644 --- a/src/junit/java/robaertschi/environmenttech/unittest/TestMod.java +++ b/src/junit/java/xyz/robaertschi/environmenttech/unittest/TestMod.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.unittest; +package xyz.robaertschi.environmenttech.unittest; import net.neoforged.fml.common.Mod; diff --git a/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java b/src/junit/java/xyz/robaertschi/environmenttech/unittest/TestProgressBar.java similarity index 90% rename from src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java rename to src/junit/java/xyz/robaertschi/environmenttech/unittest/TestProgressBar.java index ff755f5..bc3c507 100644 --- a/src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java +++ b/src/junit/java/xyz/robaertschi/environmenttech/unittest/TestProgressBar.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.unittest; +package xyz.robaertschi.environmenttech.unittest; import org.junit.jupiter.api.Test; -import robaertschi.environmenttech.client.screen.ProgressArrowUtils; +import xyz.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/xyz/robaertschi/environmenttech/Config.java similarity index 95% rename from src/main/java/robaertschi/environmenttech/Config.java rename to src/main/java/xyz/robaertschi/environmenttech/Config.java index 96a70bd..1b8de68 100644 --- a/src/main/java/robaertschi/environmenttech/Config.java +++ b/src/main/java/xyz/robaertschi/environmenttech/Config.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech; +package xyz.robaertschi.environmenttech; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.event.config.ModConfigEvent; import net.neoforged.neoforge.common.ModConfigSpec; -import static robaertschi.environmenttech.ET.MODID; +import static xyz.robaertschi.environmenttech.ET.MODID; // An example config class. This is not required, but it's a good idea to have one to keep your config organized. // Demonstrates how to use Neo's config APIs diff --git a/src/main/java/robaertschi/environmenttech/ET.java b/src/main/java/xyz/robaertschi/environmenttech/ET.java similarity index 96% rename from src/main/java/robaertschi/environmenttech/ET.java rename to src/main/java/xyz/robaertschi/environmenttech/ET.java index c595f21..321fb0f 100644 --- a/src/main/java/robaertschi/environmenttech/ET.java +++ b/src/main/java/xyz/robaertschi/environmenttech/ET.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech; +package xyz.robaertschi.environmenttech; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/robaertschi/environmenttech/EnvironmentTech.java b/src/main/java/xyz/robaertschi/environmenttech/EnvironmentTech.java similarity index 73% rename from src/main/java/robaertschi/environmenttech/EnvironmentTech.java rename to src/main/java/xyz/robaertschi/environmenttech/EnvironmentTech.java index 90e7cf3..5061284 100644 --- a/src/main/java/robaertschi/environmenttech/EnvironmentTech.java +++ b/src/main/java/xyz/robaertschi/environmenttech/EnvironmentTech.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech; +package xyz.robaertschi.environmenttech; import net.neoforged.bus.api.IEventBus; import net.neoforged.bus.api.SubscribeEvent; @@ -27,21 +27,21 @@ import org.slf4j.Logger; import com.mojang.logging.LogUtils; -import robaertschi.environmenttech.command.EnvironmenttechCommand; -import robaertschi.environmenttech.compat.ETCompat; -import robaertschi.environmenttech.data.attachments.ETAttachments; -import robaertschi.environmenttech.data.capabilities.ETCapabilities; -import robaertschi.environmenttech.data.components.ETComponents; -import robaertschi.environmenttech.data.recipes.ETRecipes; -import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.level.block.entity.ETBlockEntities; -import robaertschi.environmenttech.level.fluid.ETFluidTypes; -import robaertschi.environmenttech.level.fluid.ETFluids; -import robaertschi.environmenttech.level.item.ETItems; -import robaertschi.environmenttech.level.particle.ETParticles; -import robaertschi.environmenttech.menu.ETMenus; +import xyz.robaertschi.environmenttech.command.EnvironmenttechCommand; +import xyz.robaertschi.environmenttech.compat.ETCompat; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.data.capabilities.ETCapabilities; +import xyz.robaertschi.environmenttech.data.components.ETComponents; +import xyz.robaertschi.environmenttech.data.recipes.ETRecipes; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities; +import xyz.robaertschi.environmenttech.level.fluid.ETFluidTypes; +import xyz.robaertschi.environmenttech.level.fluid.ETFluids; +import xyz.robaertschi.environmenttech.level.item.ETItems; +import xyz.robaertschi.environmenttech.level.particle.ETParticles; +import xyz.robaertschi.environmenttech.menu.ETMenus; -import static robaertschi.environmenttech.ET.MODID; +import static xyz.robaertschi.environmenttech.ET.MODID; @Mod(MODID) diff --git a/src/main/java/robaertschi/environmenttech/client/ETClient.java b/src/main/java/xyz/robaertschi/environmenttech/client/ETClient.java similarity index 74% rename from src/main/java/robaertschi/environmenttech/client/ETClient.java rename to src/main/java/xyz/robaertschi/environmenttech/client/ETClient.java index 987795e..93872b3 100644 --- a/src/main/java/robaertschi/environmenttech/client/ETClient.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/ETClient.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.client; +package xyz.robaertschi.environmenttech.client; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; @@ -23,17 +23,17 @@ import net.neoforged.neoforge.client.event.*; import net.minecraft.client.renderer.item.ItemProperties; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.client.particle.EnvParticleProvider; -import robaertschi.environmenttech.client.screen.EnvCollectorScreen; -import robaertschi.environmenttech.data.components.ETComponents; -import robaertschi.environmenttech.data.components.FilledComponent; -import robaertschi.environmenttech.level.block.entity.ETBlockEntities; -import robaertschi.environmenttech.level.block.entity.renderer.EnvCollectorRenderer; -import robaertschi.environmenttech.level.block.entity.renderer.EnvDistributorRenderer; -import robaertschi.environmenttech.level.item.ETItems; -import robaertschi.environmenttech.level.particle.ETParticles; -import robaertschi.environmenttech.menu.ETMenus; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.client.particle.EnvParticleProvider; +import xyz.robaertschi.environmenttech.client.screen.EnvCollectorScreen; +import xyz.robaertschi.environmenttech.data.components.ETComponents; +import xyz.robaertschi.environmenttech.data.components.FilledComponent; +import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities; +import xyz.robaertschi.environmenttech.level.block.entity.renderer.EnvCollectorRenderer; +import xyz.robaertschi.environmenttech.level.block.entity.renderer.EnvDistributorRenderer; +import xyz.robaertschi.environmenttech.level.item.ETItems; +import xyz.robaertschi.environmenttech.level.particle.ETParticles; +import xyz.robaertschi.environmenttech.menu.ETMenus; @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD) public class ETClient { diff --git a/src/main/java/robaertschi/environmenttech/client/RenderUtils.java b/src/main/java/xyz/robaertschi/environmenttech/client/RenderUtils.java similarity index 99% rename from src/main/java/robaertschi/environmenttech/client/RenderUtils.java rename to src/main/java/xyz/robaertschi/environmenttech/client/RenderUtils.java index e314a59..3afbca2 100644 --- a/src/main/java/robaertschi/environmenttech/client/RenderUtils.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/RenderUtils.java @@ -1,4 +1,4 @@ -package robaertschi.environmenttech.client; +package xyz.robaertschi.environmenttech.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java b/src/main/java/xyz/robaertschi/environmenttech/client/particle/EnvParticleProvider.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java rename to src/main/java/xyz/robaertschi/environmenttech/client/particle/EnvParticleProvider.java index 94ece1b..f5c88c1 100644 --- a/src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/particle/EnvParticleProvider.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.client.particle; +package xyz.robaertschi.environmenttech.client.particle; import lombok.AllArgsConstructor; @@ -27,7 +27,7 @@ import net.minecraft.client.particle.ParticleProvider; import net.minecraft.client.particle.SpriteSet; import net.minecraft.core.particles.SimpleParticleType; -import robaertschi.environmenttech.level.particle.EnvParticle; +import xyz.robaertschi.environmenttech.level.particle.EnvParticle; @AllArgsConstructor() public class EnvParticleProvider implements ParticleProvider { diff --git a/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java b/src/main/java/xyz/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java similarity index 96% rename from src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java rename to src/main/java/xyz/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java index 623d64d..b1367a0 100644 --- a/src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.client.renderer; +package xyz.robaertschi.environmenttech.client.renderer; import lombok.AllArgsConstructor; diff --git a/src/main/java/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java b/src/main/java/xyz/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java rename to src/main/java/xyz/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java index c923e1d..5e33a85 100644 --- a/src/main/java/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java @@ -1,4 +1,4 @@ -package robaertschi.environmenttech.client.renderer; +package xyz.robaertschi.environmenttech.client.renderer; import java.util.List; import java.util.Optional; @@ -8,8 +8,8 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.util.FastColor; -import robaertschi.environmenttech.data.capabilities.IEnvStorage; -import robaertschi.environmenttech.utils.MouseUtils; +import xyz.robaertschi.environmenttech.data.capabilities.IEnvStorage; +import xyz.robaertschi.environmenttech.utils.MouseUtils; /* * BluSunrize diff --git a/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java b/src/main/java/xyz/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java rename to src/main/java/xyz/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java index 8822b52..717081a 100644 --- a/src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.client.screen; +package xyz.robaertschi.environmenttech.client.screen; import org.jetbrains.annotations.NotNull; @@ -24,9 +24,9 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; -import robaertschi.environmenttech.menu.EnvCollectorMenu; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer; +import xyz.robaertschi.environmenttech.menu.EnvCollectorMenu; public class EnvCollectorScreen extends AbstractContainerScreen { public static final ResourceLocation GUI = ET.id("textures/gui/container/env_collector.png"); diff --git a/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java b/src/main/java/xyz/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java rename to src/main/java/xyz/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java index e7e8120..756e13e 100644 --- a/src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java +++ b/src/main/java/xyz/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.client.screen; +package xyz.robaertschi.environmenttech.client.screen; import net.minecraft.resources.ResourceLocation; -import robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.ET; public class ProgressArrowUtils { public static final ResourceLocation SPRITE = ET.id("textures/gui/sprites/component/progress_arrow.png"); diff --git a/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java b/src/main/java/xyz/robaertschi/environmenttech/command/EnvironmenttechCommand.java similarity index 94% rename from src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java rename to src/main/java/xyz/robaertschi/environmenttech/command/EnvironmenttechCommand.java index 533f788..e2092cf 100644 --- a/src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java +++ b/src/main/java/xyz/robaertschi/environmenttech/command/EnvironmenttechCommand.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.command; +package xyz.robaertschi.environmenttech.command; import net.neoforged.neoforge.server.command.EnumArgument; @@ -29,9 +29,9 @@ 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 robaertschi.environmenttech.data.capabilities.ETCapabilities; -import robaertschi.environmenttech.data.capabilities.EnvType; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.data.capabilities.ETCapabilities; +import xyz.robaertschi.environmenttech.data.capabilities.EnvType; import static net.minecraft.commands.Commands.*; diff --git a/src/main/java/robaertschi/environmenttech/compat/ETCompat.java b/src/main/java/xyz/robaertschi/environmenttech/compat/ETCompat.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/compat/ETCompat.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/ETCompat.java index fabae29..367010c 100644 --- a/src/main/java/robaertschi/environmenttech/compat/ETCompat.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/ETCompat.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat; +package xyz.robaertschi.environmenttech.compat; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.ModList; -import robaertschi.environmenttech.compat.top.TopCompat; +import xyz.robaertschi.environmenttech.compat.top.TopCompat; public class ETCompat { public static void init(IEventBus modEventBus) { diff --git a/src/main/java/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java similarity index 86% rename from src/main/java/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java index a0569c5..d749da3 100644 --- a/src/main/java/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.emi; +package xyz.robaertschi.environmenttech.compat.emi; import dev.emi.emi.api.EmiEntrypoint; import dev.emi.emi.api.EmiPlugin; @@ -27,11 +27,11 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeManager; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.data.recipes.ETRecipes; -import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; -import robaertschi.environmenttech.level.item.ETItems; -import robaertschi.environmenttech.menu.ETMenus; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.data.recipes.ETRecipes; +import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; +import xyz.robaertschi.environmenttech.level.item.ETItems; +import xyz.robaertschi.environmenttech.menu.ETMenus; @EmiEntrypoint public class EmiCompatPlugin implements EmiPlugin { diff --git a/src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java similarity index 89% rename from src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java index b5b0fb2..a9d73fc 100644 --- a/src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.emi; +package xyz.robaertschi.environmenttech.compat.emi; import dev.emi.emi.api.recipe.BasicEmiRecipe; import dev.emi.emi.api.render.EmiTexture; @@ -24,8 +24,8 @@ import dev.emi.emi.api.widget.WidgetHolder; import net.minecraft.network.chat.Component; -import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; -import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; +import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer; +import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; public class EnvCollectorEmiRecipe extends BasicEmiRecipe { private final EnvCollectorRecipe recipe; diff --git a/src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java index fd25f55..8b7bf9c 100644 --- a/src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.emi; +package xyz.robaertschi.environmenttech.compat.emi; import java.util.List; @@ -24,7 +24,7 @@ import org.apache.commons.compress.utils.Lists; import net.minecraft.world.inventory.Slot; -import robaertschi.environmenttech.menu.EnvCollectorMenu; +import xyz.robaertschi.environmenttech.menu.EnvCollectorMenu; public class EnvCollectorEmiRecipeHandler implements StandardRecipeHandler { @Override diff --git a/src/main/java/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java b/src/main/java/xyz/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java similarity index 89% rename from src/main/java/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java index fa38b1c..56a0a75 100644 --- a/src/main/java/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.jei; +package xyz.robaertschi.environmenttech.compat.jei; import java.util.ArrayList; import java.util.List; @@ -36,12 +36,12 @@ import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.RecipeHolder; -import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; -import robaertschi.environmenttech.client.screen.EnvCollectorScreen; -import robaertschi.environmenttech.data.recipes.ETRecipes; -import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; -import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.utils.MouseUtils; +import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer; +import xyz.robaertschi.environmenttech.client.screen.EnvCollectorScreen; +import xyz.robaertschi.environmenttech.data.recipes.ETRecipes; +import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.utils.MouseUtils; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java b/src/main/java/xyz/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java similarity index 87% rename from src/main/java/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java index 2a3282e..15847fe 100644 --- a/src/main/java/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.jei; +package xyz.robaertschi.environmenttech.compat.jei; import javax.annotation.ParametersAreNonnullByDefault; @@ -32,12 +32,12 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.data.recipes.ETRecipes; -import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; -import robaertschi.environmenttech.menu.ETMenus; -import robaertschi.environmenttech.menu.EnvCollectorMenu; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.data.recipes.ETRecipes; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; +import xyz.robaertschi.environmenttech.menu.ETMenus; +import xyz.robaertschi.environmenttech.menu.EnvCollectorMenu; @JeiPlugin @ParametersAreNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/compat/top/TOPInfoProvider.java b/src/main/java/xyz/robaertschi/environmenttech/compat/top/TOPInfoProvider.java similarity index 95% rename from src/main/java/robaertschi/environmenttech/compat/top/TOPInfoProvider.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/top/TOPInfoProvider.java index 42c3747..903cd3f 100644 --- a/src/main/java/robaertschi/environmenttech/compat/top/TOPInfoProvider.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/top/TOPInfoProvider.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.top; +package xyz.robaertschi.environmenttech.compat.top; import mcjty.theoneprobe.api.IProbeHitData; import mcjty.theoneprobe.api.IProbeInfo; diff --git a/src/main/java/robaertschi/environmenttech/compat/top/TopCompat.java b/src/main/java/xyz/robaertschi/environmenttech/compat/top/TopCompat.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/compat/top/TopCompat.java rename to src/main/java/xyz/robaertschi/environmenttech/compat/top/TopCompat.java index 82d990c..fe0ebee 100644 --- a/src/main/java/robaertschi/environmenttech/compat/top/TopCompat.java +++ b/src/main/java/xyz/robaertschi/environmenttech/compat/top/TopCompat.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.compat.top; +package xyz.robaertschi.environmenttech.compat.top; import java.util.function.Function; @@ -30,12 +30,12 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.EnvironmentTech; -import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; -import robaertschi.environmenttech.data.capabilities.ETCapabilities; -import robaertschi.environmenttech.data.capabilities.EnvType; -import robaertschi.environmenttech.data.capabilities.IEnvStorage; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.EnvironmentTech; +import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer; +import xyz.robaertschi.environmenttech.data.capabilities.ETCapabilities; +import xyz.robaertschi.environmenttech.data.capabilities.EnvType; +import xyz.robaertschi.environmenttech.data.capabilities.IEnvStorage; public class TopCompat { public static void init(IEventBus modEventBus) { diff --git a/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java b/src/main/java/xyz/robaertschi/environmenttech/data/attachments/ETAttachments.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java rename to src/main/java/xyz/robaertschi/environmenttech/data/attachments/ETAttachments.java index 903cc03..87db9ff 100644 --- a/src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/attachments/ETAttachments.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.attachments; +package xyz.robaertschi.environmenttech.data.attachments; import java.util.function.Supplier; @@ -25,10 +25,11 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries; import com.mojang.serialization.Codec; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETAttachments { - private static final DeferredRegister> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, MODID); + private static final DeferredRegister> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, ET.MODID); public static final Supplier> ENV = ATTACHMENT_TYPES.register( "env", () -> AttachmentType.builder(() -> 0L).serialize(Codec.LONG).build() diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java similarity index 97% rename from src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java rename to src/main/java/xyz/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java index 44c28f3..3cec055 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.capabilities; +package xyz.robaertschi.environmenttech.data.capabilities; import lombok.AllArgsConstructor; diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/ETCapabilities.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java rename to src/main/java/xyz/robaertschi/environmenttech/data/capabilities/ETCapabilities.java index bf4cc83..c511c60 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/ETCapabilities.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.capabilities; +package xyz.robaertschi.environmenttech.data.capabilities; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.capabilities.BlockCapability; @@ -23,8 +23,8 @@ import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.minecraft.core.Direction; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.level.block.entity.ETBlockEntities; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities; public class ETCapabilities { public static final BlockCapability ENV_STORAGE_BLOCK = diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvStorage.java similarity index 97% rename from src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java rename to src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvStorage.java index 42bb89f..9c9e50d 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvStorage.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.capabilities; +package xyz.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/xyz/robaertschi/environmenttech/data/capabilities/EnvType.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java rename to src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvType.java index b55f76c..856ca4f 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvType.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.capabilities; +package xyz.robaertschi.environmenttech.data.capabilities; public enum EnvType { Chunk, diff --git a/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/IEnvStorage.java similarity index 95% rename from src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java rename to src/main/java/xyz/robaertschi/environmenttech/data/capabilities/IEnvStorage.java index c021b87..7ed6c21 100644 --- a/src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/capabilities/IEnvStorage.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.capabilities; +package xyz.robaertschi.environmenttech.data.capabilities; /** * ENV is pushed based, so you should not be able to extract ENV from anything. diff --git a/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java b/src/main/java/xyz/robaertschi/environmenttech/data/components/ETComponents.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/data/components/ETComponents.java rename to src/main/java/xyz/robaertschi/environmenttech/data/components/ETComponents.java index 6ec1342..c20b2f5 100644 --- a/src/main/java/robaertschi/environmenttech/data/components/ETComponents.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/components/ETComponents.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.components; +package xyz.robaertschi.environmenttech.data.components; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; @@ -22,10 +22,11 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.minecraft.core.component.DataComponentType; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETComponents { - public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(MODID); + public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(ET.MODID); public static final DeferredHolder, DataComponentType> FILLED_COMPONENT = DATA_COMPONENTS.registerComponentType("filled_component", filledComponentBuilder -> filledComponentBuilder.persistent(FilledComponent.CODEC).networkSynchronized(FilledComponent.STREAM_CODEC) diff --git a/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java b/src/main/java/xyz/robaertschi/environmenttech/data/components/FilledComponent.java similarity index 96% rename from src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java rename to src/main/java/xyz/robaertschi/environmenttech/data/components/FilledComponent.java index 38cb1ff..f95a236 100644 --- a/src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/components/FilledComponent.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.components; +package xyz.robaertschi.environmenttech.data.components; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/ETRecipes.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java rename to src/main/java/xyz/robaertschi/environmenttech/data/recipes/ETRecipes.java index fba3a72..9fcad3b 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/ETRecipes.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.recipes; +package xyz.robaertschi.environmenttech.data.recipes; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; @@ -24,11 +24,12 @@ import net.minecraft.core.registries.Registries; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETRecipes { - public static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(Registries.RECIPE_TYPE, MODID); - public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(Registries.RECIPE_SERIALIZER, MODID); + public static final DeferredRegister> RECIPE_TYPES = DeferredRegister.create(Registries.RECIPE_TYPE, ET.MODID); + public static final DeferredRegister> RECIPE_SERIALIZERS = DeferredRegister.create(Registries.RECIPE_SERIALIZER, ET.MODID); public static final DeferredHolder, RecipeType> ENV_COLLECTOR_RECIPE_TYPE = RECIPE_TYPES.register("env_collector", RecipeType::simple); public static final DeferredHolder, RecipeSerializer> ENV_COLLECTOR_RECIPE_SERIALIZER = RECIPE_SERIALIZERS.register("env_collector", EnvCollectorRecipeSerializer::new); diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java similarity index 98% rename from src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java rename to src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java index 94bb9ec..c6903d4 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.recipes; +package xyz.robaertschi.environmenttech.data.recipes; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java similarity index 98% rename from src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java rename to src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java index ac01854..0ed32e1 100644 --- a/src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java +++ b/src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.data.recipes; +package xyz.robaertschi.environmenttech.data.recipes; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETBlockStateProvider.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java rename to src/main/java/xyz/robaertschi/environmenttech/datagen/ETBlockStateProvider.java index a2052f5..dca7558 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java +++ b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETBlockStateProvider.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.datagen; +package xyz.robaertschi.environmenttech.datagen; import net.neoforged.neoforge.client.model.generators.BlockStateProvider; import net.neoforged.neoforge.client.model.generators.ModelFile; @@ -22,9 +22,9 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.minecraft.data.PackOutput; -import robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; -import static robaertschi.environmenttech.ET.MODID; +import static xyz.robaertschi.environmenttech.ET.MODID; public class ETBlockStateProvider extends BlockStateProvider { public ETBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETDatagen.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java rename to src/main/java/xyz/robaertschi/environmenttech/datagen/ETDatagen.java index 04a4640..918aa57 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java +++ b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETDatagen.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.datagen; +package xyz.robaertschi.environmenttech.datagen; import java.util.concurrent.CompletableFuture; @@ -27,9 +27,10 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; -@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = MODID) + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = ET.MODID) public class ETDatagen { @SubscribeEvent() public static void gatherData(GatherDataEvent event) { diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETItemModelProvider.java similarity index 87% rename from src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java rename to src/main/java/xyz/robaertschi/environmenttech/datagen/ETItemModelProvider.java index 87c5654..5f37010 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java +++ b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETItemModelProvider.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.datagen; +package xyz.robaertschi.environmenttech.datagen; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; @@ -24,12 +24,12 @@ import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.level.item.ETItems; -import robaertschi.environmenttech.level.item.EnvDetectorItem; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.level.item.ETItems; +import xyz.robaertschi.environmenttech.level.item.EnvDetectorItem; -import static robaertschi.environmenttech.ET.MODID; +import static xyz.robaertschi.environmenttech.ET.MODID; public class ETItemModelProvider extends ItemModelProvider { public ETItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { diff --git a/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETRecipeProvider.java similarity index 95% rename from src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java rename to src/main/java/xyz/robaertschi/environmenttech/datagen/ETRecipeProvider.java index 1e7f71c..22c6d74 100644 --- a/src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java +++ b/src/main/java/xyz/robaertschi/environmenttech/datagen/ETRecipeProvider.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.datagen; +package xyz.robaertschi.environmenttech.datagen; import java.util.concurrent.CompletableFuture; @@ -33,9 +33,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -import robaertschi.environmenttech.ET; -import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; -import robaertschi.environmenttech.level.item.ETItems; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; +import xyz.robaertschi.environmenttech.level.item.ETItems; public class ETRecipeProvider extends RecipeProvider { public ETRecipeProvider(PackOutput pOutput, CompletableFuture pRegistries) { diff --git a/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java b/src/main/java/xyz/robaertschi/environmenttech/level/ETChunkEvents.java similarity index 91% rename from src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java rename to src/main/java/xyz/robaertschi/environmenttech/level/ETChunkEvents.java index 99d2ac3..ff16312 100644 --- a/src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/ETChunkEvents.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level; +package xyz.robaertschi.environmenttech.level; import lombok.extern.slf4j.Slf4j; @@ -25,9 +25,9 @@ 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.ET; -import robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.Config; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; @EventBusSubscriber(modid = ET.MODID) @Slf4j(topic = "EnvironmentTech/ChunkData") diff --git a/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/ETBlocks.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/ETBlocks.java index 3c9dac0..7e8216f 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/ETBlocks.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block; +package xyz.robaertschi.environmenttech.level.block; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredBlock; @@ -22,11 +22,12 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.minecraft.world.level.block.state.BlockBehaviour; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETBlocks { // Create a Deferred Register to hold Blocks which will all be registered under the "environmenttech" namespace - public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MODID); + public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(ET.MODID); // Creates a new Block with the id "environmenttech:example_block", combining the namespace and path // public static final DeferredBlock EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE)); public static final DeferredBlock ENV_COLLECTOR_BLOCK = BLOCKS.registerBlock("env_collector", EnvCollectorBlock::new, BlockBehaviour.Properties.of()); diff --git a/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/EnvCollectorBlock.java similarity index 95% rename from src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/EnvCollectorBlock.java index ece0e8e..4526b17 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/EnvCollectorBlock.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block; +package xyz.robaertschi.environmenttech.level.block; import lombok.extern.slf4j.Slf4j; @@ -43,8 +43,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; import com.mojang.serialization.MapCodec; -import robaertschi.environmenttech.level.block.entity.ETBlockEntities; -import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; +import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities; +import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; @ParametersAreNonnullByDefault() @Slf4j diff --git a/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/EnvDistributorBlock.java similarity index 94% rename from src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/EnvDistributorBlock.java index 87cda7f..458f4b5 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/EnvDistributorBlock.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block; +package xyz.robaertschi.environmenttech.level.block; import lombok.extern.slf4j.Slf4j; @@ -35,8 +35,8 @@ import net.minecraft.world.phys.shapes.VoxelShape; import com.mojang.serialization.MapCodec; -import robaertschi.environmenttech.level.block.entity.ETBlockEntities; -import robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity; +import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities; +import xyz.robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity; @Slf4j @ParametersAreNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java similarity index 97% rename from src/main/java/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java index 0ef87ff..23bd0bc 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block; +package xyz.robaertschi.environmenttech.level.block; import javax.annotation.ParametersAreNonnullByDefault; @@ -39,7 +39,7 @@ 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 robaertschi.environmenttech.level.block.entity.ITickableBlockEntity; +import xyz.robaertschi.environmenttech.level.block.entity.ITickableBlockEntity; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java similarity index 91% rename from src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java index cbd5967..c160456 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity; +package xyz.robaertschi.environmenttech.level.block.entity; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; @@ -23,13 +23,13 @@ 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 xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; -import static robaertschi.environmenttech.ET.MODID; @SuppressWarnings("DataFlowIssue") public class ETBlockEntities { - public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, MODID); + public static final DeferredRegister> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, ET.MODID); @SuppressWarnings("DataFlowIssue") public static final DeferredHolder, BlockEntityType> ENV_COLLECTOR_BLOCK_ENTITY = diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java index 48a471d..b2f150e 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity; +package xyz.robaertschi.environmenttech.level.block.entity; import lombok.Getter; @@ -50,16 +50,16 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import robaertschi.environmenttech.compat.top.TOPInfoProvider; -import robaertschi.environmenttech.data.attachments.ETAttachments; -import robaertschi.environmenttech.data.capabilities.AdaptedItemHandler; -import robaertschi.environmenttech.data.capabilities.EnvStorage; -import robaertschi.environmenttech.data.capabilities.EnvType; -import robaertschi.environmenttech.data.recipes.ETRecipes; -import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; -import robaertschi.environmenttech.menu.EnvCollectorMenu; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.compat.top.TOPInfoProvider; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.data.capabilities.AdaptedItemHandler; +import xyz.robaertschi.environmenttech.data.capabilities.EnvStorage; +import xyz.robaertschi.environmenttech.data.capabilities.EnvType; +import xyz.robaertschi.environmenttech.data.recipes.ETRecipes; +import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe; +import xyz.robaertschi.environmenttech.menu.EnvCollectorMenu; -import static robaertschi.environmenttech.ET.MODID; public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider, ITickableBlockEntity, TOPInfoProvider { @@ -189,7 +189,7 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider @Override protected void loadAdditional(@NotNull CompoundTag pTag, HolderLookup.@NotNull Provider provider) { super.loadAdditional(pTag, provider); - CompoundTag modData = pTag.getCompound(MODID); + CompoundTag modData = pTag.getCompound(ET.MODID); inputInventory.deserializeNBT(provider, modData.getCompound(INPUT_INVENTORY_KEY)); outputInventory.deserializeNBT(provider, modData.getCompound(OUTPUT_INVENTORY_KEY)); this.envStorage.setEnvStored(modData.getLong(ENV_KEY)); @@ -206,7 +206,7 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider modData.putLong(ENV_KEY, envStorage.getEnvStored()); modData.putInt(PROGRESS_KEY, progress); // modData.putInt(MAX_PROGRESS_KEY, maxProgress); - pTag.put(MODID, modData); + pTag.put(ET.MODID, modData); } diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java similarity index 91% rename from src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java index b8eaed9..0ac92c7 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity; +package xyz.robaertschi.environmenttech.level.block.entity; import lombok.Getter; @@ -35,11 +35,11 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import robaertschi.environmenttech.data.attachments.ETAttachments; -import robaertschi.environmenttech.data.capabilities.EnvStorage; -import robaertschi.environmenttech.data.capabilities.EnvType; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.data.capabilities.EnvStorage; +import xyz.robaertschi.environmenttech.data.capabilities.EnvType; -import static robaertschi.environmenttech.ET.MODID; @Getter @ParametersAreNonnullByDefault @@ -77,7 +77,7 @@ public class EnvDistributorBlockEntity extends BlockEntity implements ITickableB @Override protected void loadAdditional(@NotNull CompoundTag pTag, HolderLookup.@NotNull Provider pRegistries) { super.loadAdditional(pTag, pRegistries); - CompoundTag modData = pTag.getCompound(MODID); + CompoundTag modData = pTag.getCompound(ET.MODID); this.envStorage.setEnvStored(modData.getLong(ENV_TAG)); } @@ -86,7 +86,7 @@ public class EnvDistributorBlockEntity extends BlockEntity implements ITickableB super.saveAdditional(pTag, pRegistries); CompoundTag modData = new CompoundTag(); modData.putLong(ENV_TAG, envStorage.getEnvStored()); - pTag.put(MODID, modData); + pTag.put(ET.MODID, modData); } @Override diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java similarity index 94% rename from src/main/java/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java index c5ec1bb..5c9e227 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity; +package xyz.robaertschi.environmenttech.level.block.entity; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java similarity index 93% rename from src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java index 0f39be9..b6edf77 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity.renderer; +package xyz.robaertschi.environmenttech.level.block.entity.renderer; import java.util.Objects; import javax.annotation.ParametersAreNonnullByDefault; @@ -37,9 +37,9 @@ 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 xyz.robaertschi.environmenttech.level.block.EnvCollectorBlock; +import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; +import xyz.robaertschi.environmenttech.level.particle.ETParticles; @ParametersAreNonnullByDefault public class EnvCollectorRenderer implements BlockEntityRenderer { diff --git a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java rename to src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java index f5e2cec..c597697 100644 --- a/src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.block.entity.renderer; +package xyz.robaertschi.environmenttech.level.block.entity.renderer; import lombok.extern.slf4j.Slf4j; @@ -30,9 +30,9 @@ import net.minecraft.world.phys.Vec3; import com.mojang.blaze3d.vertex.PoseStack; -import robaertschi.environmenttech.client.RenderUtils; -import robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity; -import robaertschi.environmenttech.level.fluid.ETFluids; +import xyz.robaertschi.environmenttech.client.RenderUtils; +import xyz.robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity; +import xyz.robaertschi.environmenttech.level.fluid.ETFluids; @Slf4j @ParametersAreNonnullByDefault diff --git a/src/main/java/robaertschi/environmenttech/level/fluid/ETFluidTypes.java b/src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluidTypes.java similarity index 91% rename from src/main/java/robaertschi/environmenttech/level/fluid/ETFluidTypes.java rename to src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluidTypes.java index a5396f3..0b45662 100644 --- a/src/main/java/robaertschi/environmenttech/level/fluid/ETFluidTypes.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluidTypes.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.fluid; +package xyz.robaertschi.environmenttech.level.fluid; import java.util.function.Consumer; import javax.annotation.ParametersAreNonnullByDefault; @@ -29,16 +29,16 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.resources.ResourceLocation; -import robaertschi.environmenttech.client.renderer.EnvStorageRenderer; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer; -import static robaertschi.environmenttech.ET.MODID; public class ETFluidTypes { public static final ResourceLocation WATER_STILL_RL = ResourceLocation.withDefaultNamespace("block/water_still"); public static final ResourceLocation WATER_FLOWING_RL = ResourceLocation.withDefaultNamespace("block/water_flow"); - public static final DeferredRegister FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.FLUID_TYPES, MODID); + public static final DeferredRegister FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.FLUID_TYPES, ET.MODID); public static final DeferredHolder ENV = FLUID_TYPES.register("env", resourceLocation -> new FluidType( diff --git a/src/main/java/robaertschi/environmenttech/level/fluid/ETFluids.java b/src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluids.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/level/fluid/ETFluids.java rename to src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluids.java index 3b42c0c..784bb2c 100644 --- a/src/main/java/robaertschi/environmenttech/level/fluid/ETFluids.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluids.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.fluid; +package xyz.robaertschi.environmenttech.level.fluid; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.fluids.BaseFlowingFluid; @@ -24,11 +24,12 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.level.material.Fluid; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETFluids { - public static final DeferredRegister FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID, MODID); + public static final DeferredRegister FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID, ET.MODID); public static final DeferredHolder ENV_FLOWING = FLUIDS.register("env_flowing", resourceLocation -> new BaseFlowingFluid.Flowing(ETFluids.ENV_PROPERTIES)); diff --git a/src/main/java/robaertschi/environmenttech/level/item/ETItems.java b/src/main/java/xyz/robaertschi/environmenttech/level/item/ETItems.java similarity index 94% rename from src/main/java/robaertschi/environmenttech/level/item/ETItems.java rename to src/main/java/xyz/robaertschi/environmenttech/level/item/ETItems.java index 82b6900..34a6c00 100644 --- a/src/main/java/robaertschi/environmenttech/level/item/ETItems.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/item/ETItems.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.item; +package xyz.robaertschi.environmenttech.level.item; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; @@ -30,15 +30,15 @@ import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.component.CustomModelData; -import robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.ET; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; -import static robaertschi.environmenttech.ET.MODID; public class ETItems { - public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID); + public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(ET.MODID); - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ET.MODID); // public static final DeferredItem EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK); diff --git a/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java b/src/main/java/xyz/robaertschi/environmenttech/level/item/EnvDetectorItem.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java rename to src/main/java/xyz/robaertschi/environmenttech/level/item/EnvDetectorItem.java index 4e1fdb3..eb4c11c 100644 --- a/src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/item/EnvDetectorItem.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.item; +package xyz.robaertschi.environmenttech.level.item; import java.util.List; import javax.annotation.ParametersAreNonnullByDefault; @@ -33,9 +33,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import robaertschi.environmenttech.data.attachments.ETAttachments; -import robaertschi.environmenttech.data.components.ETComponents; -import robaertschi.environmenttech.data.components.FilledComponent; +import xyz.robaertschi.environmenttech.data.attachments.ETAttachments; +import xyz.robaertschi.environmenttech.data.components.ETComponents; +import xyz.robaertschi.environmenttech.data.components.FilledComponent; @ParametersAreNonnullByDefault public class EnvDetectorItem extends Item { diff --git a/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java b/src/main/java/xyz/robaertschi/environmenttech/level/particle/ETParticles.java similarity index 89% rename from src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java rename to src/main/java/xyz/robaertschi/environmenttech/level/particle/ETParticles.java index 2ec1d94..23b00c3 100644 --- a/src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/particle/ETParticles.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.particle; +package xyz.robaertschi.environmenttech.level.particle; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredHolder; @@ -24,10 +24,11 @@ import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.core.registries.BuiltInRegistries; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETParticles { - public static final DeferredRegister> PARTICLES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, MODID); + public static final DeferredRegister> PARTICLES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, ET.MODID); public static final DeferredHolder, SimpleParticleType> ENV_PARTICLE = PARTICLES.register("env_particle", () -> new SimpleParticleType(false) diff --git a/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java b/src/main/java/xyz/robaertschi/environmenttech/level/particle/EnvParticle.java similarity index 97% rename from src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java rename to src/main/java/xyz/robaertschi/environmenttech/level/particle/EnvParticle.java index a3566ef..0ff72e5 100644 --- a/src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java +++ b/src/main/java/xyz/robaertschi/environmenttech/level/particle/EnvParticle.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.level.particle; +package xyz.robaertschi.environmenttech.level.particle; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/robaertschi/environmenttech/menu/ETMenus.java b/src/main/java/xyz/robaertschi/environmenttech/menu/ETMenus.java similarity index 90% rename from src/main/java/robaertschi/environmenttech/menu/ETMenus.java rename to src/main/java/xyz/robaertschi/environmenttech/menu/ETMenus.java index d4cab25..8905cd6 100644 --- a/src/main/java/robaertschi/environmenttech/menu/ETMenus.java +++ b/src/main/java/xyz/robaertschi/environmenttech/menu/ETMenus.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.menu; +package xyz.robaertschi.environmenttech.menu; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; @@ -24,10 +24,11 @@ import net.neoforged.neoforge.registries.DeferredRegister; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.world.inventory.MenuType; -import static robaertschi.environmenttech.ET.MODID; +import xyz.robaertschi.environmenttech.ET; + public class ETMenus { - public static final DeferredRegister> MENUS = DeferredRegister.create(BuiltInRegistries.MENU, MODID); + public static final DeferredRegister> MENUS = DeferredRegister.create(BuiltInRegistries.MENU, ET.MODID); public static final DeferredHolder, MenuType> ENV_COLLECTOR_MENU = MENUS.register("env_collector", () -> IMenuTypeExtension.create((windowId, inv, data) -> new EnvCollectorMenu(windowId, inv.player, data))); diff --git a/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java b/src/main/java/xyz/robaertschi/environmenttech/menu/EnvCollectorMenu.java similarity index 92% rename from src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java rename to src/main/java/xyz/robaertschi/environmenttech/menu/EnvCollectorMenu.java index 81865d7..775dbe0 100644 --- a/src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java +++ b/src/main/java/xyz/robaertschi/environmenttech/menu/EnvCollectorMenu.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -package robaertschi.environmenttech.menu; +package xyz.robaertschi.environmenttech.menu; import lombok.Getter; @@ -28,11 +28,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.*; import net.minecraft.world.item.ItemStack; -import robaertschi.environmenttech.level.block.ETBlocks; -import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; +import xyz.robaertschi.environmenttech.level.block.ETBlocks; +import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity; -import static robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_COUNT; -import static robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_INPUT; +import static xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_COUNT; +import static xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_INPUT; @SuppressWarnings("SameParameterValue") public class EnvCollectorMenu extends AbstractContainerMenu { diff --git a/src/main/java/robaertschi/environmenttech/utils/MouseUtils.java b/src/main/java/xyz/robaertschi/environmenttech/utils/MouseUtils.java similarity index 94% rename from src/main/java/robaertschi/environmenttech/utils/MouseUtils.java rename to src/main/java/xyz/robaertschi/environmenttech/utils/MouseUtils.java index f3fde79..351dff8 100644 --- a/src/main/java/robaertschi/environmenttech/utils/MouseUtils.java +++ b/src/main/java/xyz/robaertschi/environmenttech/utils/MouseUtils.java @@ -1,4 +1,4 @@ -package robaertschi.environmenttech.utils; +package xyz.robaertschi.environmenttech.utils; /** * This file is from here. diff --git a/src/main/resources/assets/environmenttech/lang/en_us.json b/src/main/resources/assets/environmenttech/lang/en_us.json index 49b5b16..d4586d5 100644 --- a/src/main/resources/assets/environmenttech/lang/en_us.json +++ b/src/main/resources/assets/environmenttech/lang/en_us.json @@ -1,8 +1,13 @@ { "item.environmenttech.env_detector": "ENV Detector", - "item.environmenttech.environmental_essence": "Environmental Essence", "item.environmenttech.env_detector.tooltip": "The ENV Detector is a handy device that shows you how much ENV is available in the current chunk. It can display from 0 to 16 ENV.", + "item.environmenttech.environmental_essence": "Environmental Essence", + "item.environmenttech.glass_tank": "Glass Tank", + "block.environmenttech.env_collector": "ENV Collector", + "block.environmenttech.env_distributor": "ENV Distributor", + + "fluid_type.environmenttech.env": "ENV", "itemGroup.environmenttech": "Environment Tech",