robaertschi/EnvironmentTech
1
0
Fork 0
mirror of https://github.com/RoBaertschi/EnvironmentTech.git synced 2025-04-19 23:03:28 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

Compare commits

base: robaertschi:0b8e03a10f4c6e6f72533aba4bc3e6ebe9770220
Branches Tags
robaertschi:1.21.x
robaertschi:1.21.x-docs
robaertschi:master
robaertschi:0.1
..
compare: robaertschi:15f64067a9765803f497e9ee408365266823e26d
Branches Tags
robaertschi:1.21.x
robaertschi:1.21.x-docs
robaertschi:master
robaertschi:0.1

No commits in common. "0b8e03a10f4c6e6f72533aba4bc3e6ebe9770220" and "15f64067a9765803f497e9ee408365266823e26d" have entirely different histories.
0b8e03a10f ... 15f64067a9

64 changed files with 224 additions and 240 deletions
Show Stats Expand all files Collapse all files

1
COPYING
View File

@ -6,7 +6,6 @@ Some code might have a different license, if this is true, then there will be a
Other Licenses:
- src
- main
- xyz
- robaertschi
- environmenttech
- client

14
build.gradle.kts
View File

@ -6,7 +6,7 @@ plugins {
idea
`maven-publish`
id("io.freefair.lombok") version "8.6"
id ("net.neoforged.gradle.userdev") version ("7.0.153")
id ("net.neoforged.gradle.userdev") version ("7.0.152")
id("com.diffplug.spotless") version "7.0.0.BETA1"
id("com.palantir.git-version") version "3.1.0"
}
@ -40,7 +40,7 @@ enum class RecipeViewer {
}
val withTop = true
val recipeViewer: RecipeViewer = RecipeViewer.JEI
val recipeViewer: RecipeViewer = RecipeViewer.EMI
val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
val details = versionDetails()
@ -48,7 +48,7 @@ val details = versionDetails()
val snapshot = "-SNAPSHOT"
val subversion = ".${details.commitDistance}"
val noTag = !details.lastTag.contains(Regex("""\d+\.\d+"""))
val end = if (noTag) snapshot else ".${details.commitDistance}${snapshot}"
val end = if (noTag) snapshot else "${details.commitDistance}${snapshot}"
val modVersion: String = "${details.lastTag}${if (details.commitDistance > 0 || noTag) end else ""}"
val release = details.commitDistance == 0 && !noTag
@ -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/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"
"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"
)
importOrder("lombok", "java|javax", "", "net.minecraft", "com.mojang", "xyz.robaertschi", "\\#")
importOrder("lombok", "java|javax", "", "net.minecraft", "com.mojang", "robaertschi", "\\#")
removeUnusedImports()
licenseHeaderFile("HEADER.java")
}

6
gradle.properties
View File

@ -12,7 +12,7 @@ minecraftVersion=1.21.0
# as they do not follow standard versioning conventions.
minecraftVersionRange=[1.21.0,1.22)
# The Neo version must agree with the Minecraft version to get a valid artifact
neoVersion=21.0.65-beta
neoVersion=21.0.42-beta
# The Neo version range can use any version of Neo as bounds
neoVersionRange=[21,)
# The loader version range can only use the major version of FML as bounds
@ -46,6 +46,6 @@ junitVersion=5.10.2
assertjVersion=3.25.1
topVersion=1.21_neo-12.0.0-1
reiVersion=16.0.729
jeiVersion=19.2.0.21
jeiVersion=19.0.0.11
jeiMcVersion=1.21
emiVersion=1.1.10+1.21
emiVersion=1.1.8+1.21

2
src/generated/resources/.cache/0634480364d8061ae303195c707eb408c0d40406
View File

@ -1,4 +1,4 @@
// 1.21 2024-07-07T13:40:04.298488344 Item Models: environmenttech
// 1.21 2024-06-28T21:07:33.627257498 Item Models: environmenttech
ee3837b261f3dbe2001ba1192716f0fdf144b663 assets/environmenttech/models/item/env_collector.json
719f96ed0245a9dc7c32294d66055e76fc594e30 assets/environmenttech/models/item/env_detector.json
e6d7f80a803863d6196f53d67487af2b3644323b assets/environmenttech/models/item/env_detector_0.json

2
src/generated/resources/.cache/8b2774695afa9ce737bd82b254cc934e377236ee
View File

@ -1,3 +1,3 @@
// 1.21 2024-07-07T13:40:04.297878793 Block States: environmenttech
// 1.21 2024-06-26T15:38:42.326642 Block States: environmenttech
6abc8b83d4fb4316ca2dbb977510e6f349ef9e9c assets/environmenttech/blockstates/env_collector.json
f7e8f32de50650930080d0d5d1a24176774d4bb9 assets/environmenttech/blockstates/env_distributor.json

2
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View File

@ -1,4 +1,4 @@
// 1.21 2024-07-07T13:40:04.298334877 Recipes
// 1.21 2024-07-02T20:26:53.286412918 Recipes
375ee3cb8eaf222bd0d5576061d1741b5b3d5cff data/environmenttech/advancement/recipes/environmental_essence.json
99b83974e5a7a570c2111cab62a292d126c36524 data/environmenttech/advancement/recipes/misc/env_collector_block_item.json
810a3e2750c6fe259d203216b1e5046e49e345d6 data/environmenttech/advancement/recipes/misc/env_distributor_block_item.json

2
src/junit/java/xyz/robaertschi/environmenttech/unittest/TestMod.java → src/junit/java/robaertschi/environmenttech/unittest/TestMod.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.unittest;
package robaertschi.environmenttech.unittest;
import net.neoforged.fml.common.Mod;

4
src/junit/java/xyz/robaertschi/environmenttech/unittest/TestProgressBar.java → src/junit/java/robaertschi/environmenttech/unittest/TestProgressBar.java
View File

@ -14,11 +14,11 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.unittest;
package robaertschi.environmenttech.unittest;
import org.junit.jupiter.api.Test;
import xyz.robaertschi.environmenttech.client.screen.ProgressArrowUtils;
import robaertschi.environmenttech.client.screen.ProgressArrowUtils;
import static org.assertj.core.api.Assertions.*;

4
src/main/java/xyz/robaertschi/environmenttech/Config.java → src/main/java/robaertschi/environmenttech/Config.java
View File

@ -14,14 +14,14 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech;
package 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 xyz.robaertschi.environmenttech.ET.MODID;
import static 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

2
src/main/java/xyz/robaertschi/environmenttech/ET.java → src/main/java/robaertschi/environmenttech/ET.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech;
package robaertschi.environmenttech;
import net.minecraft.resources.ResourceLocation;

30
src/main/java/xyz/robaertschi/environmenttech/EnvironmentTech.java → src/main/java/robaertschi/environmenttech/EnvironmentTech.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech;
package 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 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 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 static xyz.robaertschi.environmenttech.ET.MODID;
import static robaertschi.environmenttech.ET.MODID;
@Mod(MODID)

27
src/main/java/xyz/robaertschi/environmenttech/client/ETClient.java → src/main/java/robaertschi/environmenttech/client/ETClient.java
View File

@ -14,9 +14,8 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.client;
package robaertschi.environmenttech.client;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
@ -24,19 +23,19 @@ import net.neoforged.neoforge.client.event.*;
import net.minecraft.client.renderer.item.ItemProperties;
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;
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;
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = ET.MODID, value = Dist.CLIENT)
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
public class ETClient {
@SubscribeEvent

2
src/main/java/xyz/robaertschi/environmenttech/client/RenderUtils.java → src/main/java/robaertschi/environmenttech/client/RenderUtils.java
View File

@ -1,4 +1,4 @@
package xyz.robaertschi.environmenttech.client;
package robaertschi.environmenttech.client;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;

4
src/main/java/xyz/robaertschi/environmenttech/client/particle/EnvParticleProvider.java → src/main/java/robaertschi/environmenttech/client/particle/EnvParticleProvider.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.client.particle;
package 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 xyz.robaertschi.environmenttech.level.particle.EnvParticle;
import robaertschi.environmenttech.level.particle.EnvParticle;
@AllArgsConstructor()
public class EnvParticleProvider implements ParticleProvider<SimpleParticleType> {

2
src/main/java/xyz/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java → src/main/java/robaertschi/environmenttech/client/renderer/ContentBoxRenderer.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.client.renderer;
package robaertschi.environmenttech.client.renderer;
import lombok.AllArgsConstructor;

6
src/main/java/xyz/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java → src/main/java/robaertschi/environmenttech/client/renderer/EnvStorageRenderer.java
View File

@ -1,4 +1,4 @@
package xyz.robaertschi.environmenttech.client.renderer;
package 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 xyz.robaertschi.environmenttech.data.capabilities.IEnvStorage;
import xyz.robaertschi.environmenttech.utils.MouseUtils;
import robaertschi.environmenttech.data.capabilities.IEnvStorage;
import robaertschi.environmenttech.utils.MouseUtils;
/*
* BluSunrize

8
src/main/java/xyz/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java → src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.client.screen;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import xyz.robaertschi.environmenttech.menu.EnvCollectorMenu;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import robaertschi.environmenttech.menu.EnvCollectorMenu;
public class EnvCollectorScreen extends AbstractContainerScreen<EnvCollectorMenu> {
public static final ResourceLocation GUI = ET.id("textures/gui/container/env_collector.png");

4
src/main/java/xyz/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java → src/main/java/robaertschi/environmenttech/client/screen/ProgressArrowUtils.java
View File

@ -14,11 +14,11 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.client.screen;
package robaertschi.environmenttech.client.screen;
import net.minecraft.resources.ResourceLocation;
import xyz.robaertschi.environmenttech.ET;
import robaertschi.environmenttech.ET;
public class ProgressArrowUtils {
public static final ResourceLocation SPRITE = ET.id("textures/gui/sprites/component/progress_arrow.png");

8
src/main/java/xyz/robaertschi/environmenttech/command/EnvironmenttechCommand.java → src/main/java/robaertschi/environmenttech/command/EnvironmenttechCommand.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.command;
package 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 xyz.robaertschi.environmenttech.data.attachments.ETAttachments;
import xyz.robaertschi.environmenttech.data.capabilities.ETCapabilities;
import xyz.robaertschi.environmenttech.data.capabilities.EnvType;
import robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.data.capabilities.ETCapabilities;
import robaertschi.environmenttech.data.capabilities.EnvType;
import static net.minecraft.commands.Commands.*;

4
src/main/java/xyz/robaertschi/environmenttech/compat/ETCompat.java → src/main/java/robaertschi/environmenttech/compat/ETCompat.java
View File

@ -14,12 +14,12 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat;
package robaertschi.environmenttech.compat;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModList;
import xyz.robaertschi.environmenttech.compat.top.TopCompat;
import robaertschi.environmenttech.compat.top.TopCompat;
public class ETCompat {
public static void init(IEventBus modEventBus) {

12
src/main/java/xyz/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java → src/main/java/robaertschi/environmenttech/compat/emi/EmiCompatPlugin.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.emi;
package 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 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;
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;
@EmiEntrypoint
public class EmiCompatPlugin implements EmiPlugin {

6
src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java → src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipe.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.emi;
package 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 xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
import robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
public class EnvCollectorEmiRecipe extends BasicEmiRecipe {
private final EnvCollectorRecipe recipe;

4
src/main/java/xyz/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java → src/main/java/robaertschi/environmenttech/compat/emi/EnvCollectorEmiRecipeHandler.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.emi;
package 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 xyz.robaertschi.environmenttech.menu.EnvCollectorMenu;
import robaertschi.environmenttech.menu.EnvCollectorMenu;
public class EnvCollectorEmiRecipeHandler implements StandardRecipeHandler<EnvCollectorMenu> {
@Override

14
src/main/java/xyz/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java → src/main/java/robaertschi/environmenttech/compat/jei/EnvCollectorRecipeCategory.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.jei;
package 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 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;
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;
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault

14
src/main/java/xyz/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java → src/main/java/robaertschi/environmenttech/compat/jei/JeiCompatPlugin.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.jei;
package 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 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;
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;
@JeiPlugin
@ParametersAreNonnullByDefault

2
src/main/java/xyz/robaertschi/environmenttech/compat/top/TOPInfoProvider.java → src/main/java/robaertschi/environmenttech/compat/top/TOPInfoProvider.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.top;
package robaertschi.environmenttech.compat.top;
import mcjty.theoneprobe.api.IProbeHitData;
import mcjty.theoneprobe.api.IProbeInfo;

14
src/main/java/xyz/robaertschi/environmenttech/compat/top/TopCompat.java → src/main/java/robaertschi/environmenttech/compat/top/TopCompat.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.compat.top;
package 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 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;
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;
public class TopCompat {
public static void init(IEventBus modEventBus) {

7
src/main/java/xyz/robaertschi/environmenttech/data/attachments/ETAttachments.java → src/main/java/robaertschi/environmenttech/data/attachments/ETAttachments.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.attachments;
package robaertschi.environmenttech.data.attachments;
import java.util.function.Supplier;
@ -25,11 +25,10 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries;
import com.mojang.serialization.Codec;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETAttachments {
private static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, ET.MODID);
private static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, MODID);
public static final Supplier<AttachmentType<Long>> ENV = ATTACHMENT_TYPES.register(
"env", () -> AttachmentType.builder(() -> 0L).serialize(Codec.LONG).build()

2
src/main/java/xyz/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java → src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.capabilities;
package robaertschi.environmenttech.data.capabilities;
import lombok.AllArgsConstructor;

6
src/main/java/xyz/robaertschi/environmenttech/data/capabilities/ETCapabilities.java → src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.capabilities;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.level.block.entity.ETBlockEntities;
public class ETCapabilities {
public static final BlockCapability<IEnvStorage, EnvType> ENV_STORAGE_BLOCK =

2
src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvStorage.java → src/main/java/robaertschi/environmenttech/data/capabilities/EnvStorage.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.capabilities;
package robaertschi.environmenttech.data.capabilities;
import net.minecraft.util.Mth;

2
src/main/java/xyz/robaertschi/environmenttech/data/capabilities/EnvType.java → src/main/java/robaertschi/environmenttech/data/capabilities/EnvType.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.capabilities;
package robaertschi.environmenttech.data.capabilities;
public enum EnvType {
Chunk,

2
src/main/java/xyz/robaertschi/environmenttech/data/capabilities/IEnvStorage.java → src/main/java/robaertschi/environmenttech/data/capabilities/IEnvStorage.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.capabilities;
package robaertschi.environmenttech.data.capabilities;
/**
* ENV is pushed based, so you should not be able to extract ENV from anything.

7
src/main/java/xyz/robaertschi/environmenttech/data/components/ETComponents.java → src/main/java/robaertschi/environmenttech/data/components/ETComponents.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.components;
package robaertschi.environmenttech.data.components;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredHolder;
@ -22,11 +22,10 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.core.component.DataComponentType;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETComponents {
public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(ET.MODID);
public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.createDataComponents(MODID);
public static final DeferredHolder<DataComponentType<?>, DataComponentType<FilledComponent>> FILLED_COMPONENT = DATA_COMPONENTS.registerComponentType("filled_component",
filledComponentBuilder -> filledComponentBuilder.persistent(FilledComponent.CODEC).networkSynchronized(FilledComponent.STREAM_CODEC)

2
src/main/java/xyz/robaertschi/environmenttech/data/components/FilledComponent.java → src/main/java/robaertschi/environmenttech/data/components/FilledComponent.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.components;
package robaertschi.environmenttech.data.components;
import io.netty.buffer.ByteBuf;

9
src/main/java/xyz/robaertschi/environmenttech/data/recipes/ETRecipes.java → src/main/java/robaertschi/environmenttech/data/recipes/ETRecipes.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.recipes;
package robaertschi.environmenttech.data.recipes;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredHolder;
@ -24,12 +24,11 @@ import net.minecraft.core.registries.Registries;
import net.minecraft.world.item.crafting.RecipeSerializer;
import net.minecraft.world.item.crafting.RecipeType;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETRecipes {
public static final DeferredRegister<RecipeType<?>> RECIPE_TYPES = DeferredRegister.create(Registries.RECIPE_TYPE, ET.MODID);
public static final DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(Registries.RECIPE_SERIALIZER, ET.MODID);
public static final DeferredRegister<RecipeType<?>> RECIPE_TYPES = DeferredRegister.create(Registries.RECIPE_TYPE, MODID);
public static final DeferredRegister<RecipeSerializer<?>> RECIPE_SERIALIZERS = DeferredRegister.create(Registries.RECIPE_SERIALIZER, MODID);
public static final DeferredHolder<RecipeType<?>, RecipeType<EnvCollectorRecipe>> ENV_COLLECTOR_RECIPE_TYPE = RECIPE_TYPES.register("env_collector", RecipeType::simple);
public static final DeferredHolder<RecipeSerializer<?>, RecipeSerializer<EnvCollectorRecipe>> ENV_COLLECTOR_RECIPE_SERIALIZER = RECIPE_SERIALIZERS.register("env_collector", EnvCollectorRecipeSerializer::new);

2
src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java → src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipe.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.recipes;
package robaertschi.environmenttech.data.recipes;
import lombok.RequiredArgsConstructor;

2
src/main/java/xyz/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java → src/main/java/robaertschi/environmenttech/data/recipes/EnvCollectorRecipeSerializer.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.data.recipes;
package robaertschi.environmenttech.data.recipes;
import org.jetbrains.annotations.NotNull;

6
src/main/java/xyz/robaertschi/environmenttech/datagen/ETBlockStateProvider.java → src/main/java/robaertschi/environmenttech/datagen/ETBlockStateProvider.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.datagen;
package 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 xyz.robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.block.ETBlocks;
import static xyz.robaertschi.environmenttech.ET.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETBlockStateProvider extends BlockStateProvider {
public ETBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) {

7
src/main/java/xyz/robaertschi/environmenttech/datagen/ETDatagen.java → src/main/java/robaertschi/environmenttech/datagen/ETDatagen.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.datagen;
package robaertschi.environmenttech.datagen;
import java.util.concurrent.CompletableFuture;
@ -27,10 +27,9 @@ import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = ET.MODID)
@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = MODID)
public class ETDatagen {
@SubscribeEvent()
public static void gatherData(GatherDataEvent event) {

12
src/main/java/xyz/robaertschi/environmenttech/datagen/ETItemModelProvider.java → src/main/java/robaertschi/environmenttech/datagen/ETItemModelProvider.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.datagen;
package 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 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 robaertschi.environmenttech.ET;
import robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.item.ETItems;
import robaertschi.environmenttech.level.item.EnvDetectorItem;
import static xyz.robaertschi.environmenttech.ET.MODID;
import static robaertschi.environmenttech.ET.MODID;
public class ETItemModelProvider extends ItemModelProvider {
public ETItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {

8
src/main/java/xyz/robaertschi/environmenttech/datagen/ETRecipeProvider.java → src/main/java/robaertschi/environmenttech/datagen/ETRecipeProvider.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.datagen;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
import xyz.robaertschi.environmenttech.level.item.ETItems;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.data.recipes.EnvCollectorRecipe;
import robaertschi.environmenttech.level.item.ETItems;
public class ETRecipeProvider extends RecipeProvider {
public ETRecipeProvider(PackOutput pOutput, CompletableFuture<HolderLookup.Provider> pRegistries) {

10
src/main/java/xyz/robaertschi/environmenttech/level/ETChunkEvents.java → src/main/java/robaertschi/environmenttech/level/ETChunkEvents.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level;
package 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 xyz.robaertschi.environmenttech.Config;
import xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.Config;
import robaertschi.environmenttech.ET;
import robaertschi.environmenttech.data.attachments.ETAttachments;
@EventBusSubscriber(modid = ET.MODID)
@Slf4j(topic = "EnvironmentTech/ChunkData")
@ -40,7 +40,7 @@ public class ETChunkEvents {
return;
}
int random = event.getLevel().getRandom().nextIntBetweenInclusive(Config.minEnvForNewChunk, Config.maxEnvForNewChunk);
// log.debug("New Chunk at pos {}, set random to {}", event.getChunk().getPos(), random);
log.debug("New Chunk at pos {}, set random to {}", event.getChunk().getPos(), random);
event.getChunk().setData(ETAttachments.ENV, (long)random);
} else if (!event.getChunk().hasData(ETAttachments.ENV)) {
int random = event.getLevel().getRandom().nextIntBetweenInclusive(Config.minEnvForNewChunk, Config.maxEnvForNewChunk);

7
src/main/java/xyz/robaertschi/environmenttech/level/block/ETBlocks.java → src/main/java/robaertschi/environmenttech/level/block/ETBlocks.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block;
package robaertschi.environmenttech.level.block;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredBlock;
@ -22,12 +22,11 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.world.level.block.state.BlockBehaviour;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
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(ET.MODID);
public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MODID);
// Creates a new Block with the id "environmenttech:example_block", combining the namespace and path
// public static final DeferredBlock<Block> EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_block", BlockBehaviour.Properties.of().mapColor(MapColor.STONE));
public static final DeferredBlock<EnvCollectorBlock> ENV_COLLECTOR_BLOCK = BLOCKS.registerBlock("env_collector", EnvCollectorBlock::new, BlockBehaviour.Properties.of());

6
src/main/java/xyz/robaertschi/environmenttech/level/block/EnvCollectorBlock.java → src/main/java/robaertschi/environmenttech/level/block/EnvCollectorBlock.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block;
package 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 xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
import robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
@ParametersAreNonnullByDefault()
@Slf4j

6
src/main/java/xyz/robaertschi/environmenttech/level/block/EnvDistributorBlock.java → src/main/java/robaertschi/environmenttech/level/block/EnvDistributorBlock.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block;
package 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 xyz.robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import xyz.robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity;
import robaertschi.environmenttech.level.block.entity.ETBlockEntities;
import robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity;
@Slf4j
@ParametersAreNonnullByDefault

4
src/main/java/xyz/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java → src/main/java/robaertschi/environmenttech/level/block/SimpleBlockWithEntity.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block;
package 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 xyz.robaertschi.environmenttech.level.block.entity.ITickableBlockEntity;
import robaertschi.environmenttech.level.block.entity.ITickableBlockEntity;
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault

8
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java → src/main/java/robaertschi/environmenttech/level/block/entity/ETBlockEntities.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.block.ETBlocks;
import static robaertschi.environmenttech.ET.MODID;
@SuppressWarnings("DataFlowIssue")
public class ETBlockEntities {
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, ET.MODID);
public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(Registries.BLOCK_ENTITY_TYPE, MODID);
@SuppressWarnings("DataFlowIssue")
public static final DeferredHolder<BlockEntityType<?>, BlockEntityType<EnvCollectorBlockEntity>> ENV_COLLECTOR_BLOCK_ENTITY =

24
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java → src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity;
package 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 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 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 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(ET.MODID);
CompoundTag modData = pTag.getCompound(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(ET.MODID, modData);
pTag.put(MODID, modData);
}

14
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java → src/main/java/robaertschi/environmenttech/level/block/entity/EnvDistributorBlockEntity.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity;
package 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 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 robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.data.capabilities.EnvStorage;
import 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(ET.MODID);
CompoundTag modData = pTag.getCompound(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(ET.MODID, modData);
pTag.put(MODID, modData);
}
@Override

2
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java → src/main/java/robaertschi/environmenttech/level/block/entity/ITickableBlockEntity.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity;
package robaertschi.environmenttech.level.block.entity;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;

8
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java → src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvCollectorRenderer.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity.renderer;
package 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 xyz.robaertschi.environmenttech.level.block.EnvCollectorBlock;
import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
import xyz.robaertschi.environmenttech.level.particle.ETParticles;
import robaertschi.environmenttech.level.block.EnvCollectorBlock;
import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
import robaertschi.environmenttech.level.particle.ETParticles;
@ParametersAreNonnullByDefault
public class EnvCollectorRenderer implements BlockEntityRenderer<EnvCollectorBlockEntity> {

8
src/main/java/xyz/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java → src/main/java/robaertschi/environmenttech/level/block/entity/renderer/EnvDistributorRenderer.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.block.entity.renderer;
package 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 xyz.robaertschi.environmenttech.client.RenderUtils;
import xyz.robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity;
import xyz.robaertschi.environmenttech.level.fluid.ETFluids;
import robaertschi.environmenttech.client.RenderUtils;
import robaertschi.environmenttech.level.block.entity.EnvDistributorBlockEntity;
import robaertschi.environmenttech.level.fluid.ETFluids;
@Slf4j
@ParametersAreNonnullByDefault

8
src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluidTypes.java → src/main/java/robaertschi/environmenttech/level/fluid/ETFluidTypes.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.fluid;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.client.renderer.EnvStorageRenderer;
import 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<FluidType> FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.FLUID_TYPES, ET.MODID);
public static final DeferredRegister<FluidType> FLUID_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.FLUID_TYPES, MODID);
public static final DeferredHolder<FluidType, FluidType> ENV = FLUID_TYPES.register("env",
resourceLocation -> new FluidType(

7
src/main/java/xyz/robaertschi/environmenttech/level/fluid/ETFluids.java → src/main/java/robaertschi/environmenttech/level/fluid/ETFluids.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.fluid;
package robaertschi.environmenttech.level.fluid;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.fluids.BaseFlowingFluid;
@ -24,12 +24,11 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.level.material.Fluid;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETFluids {
public static final DeferredRegister<Fluid> FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID, ET.MODID);
public static final DeferredRegister<Fluid> FLUIDS = DeferredRegister.create(BuiltInRegistries.FLUID, MODID);
public static final DeferredHolder<Fluid, Fluid> ENV_FLOWING = FLUIDS.register("env_flowing", resourceLocation -> new BaseFlowingFluid.Flowing(ETFluids.ENV_PROPERTIES));

10
src/main/java/xyz/robaertschi/environmenttech/level/item/ETItems.java → src/main/java/robaertschi/environmenttech/level/item/ETItems.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.item;
package 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 xyz.robaertschi.environmenttech.ET;
import xyz.robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.block.ETBlocks;
import static robaertschi.environmenttech.ET.MODID;
public class ETItems {
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(ET.MODID);
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID);
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, ET.MODID);
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID);
// public static final DeferredItem<BlockItem> EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK);

8
src/main/java/xyz/robaertschi/environmenttech/level/item/EnvDetectorItem.java → src/main/java/robaertschi/environmenttech/level/item/EnvDetectorItem.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.item;
package 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 xyz.robaertschi.environmenttech.data.attachments.ETAttachments;
import xyz.robaertschi.environmenttech.data.components.ETComponents;
import xyz.robaertschi.environmenttech.data.components.FilledComponent;
import robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.data.components.ETComponents;
import robaertschi.environmenttech.data.components.FilledComponent;
@ParametersAreNonnullByDefault
public class EnvDetectorItem extends Item {

7
src/main/java/xyz/robaertschi/environmenttech/level/particle/ETParticles.java → src/main/java/robaertschi/environmenttech/level/particle/ETParticles.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.particle;
package robaertschi.environmenttech.level.particle;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.registries.DeferredHolder;
@ -24,11 +24,10 @@ import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.core.registries.BuiltInRegistries;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETParticles {
public static final DeferredRegister<ParticleType<?>> PARTICLES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, ET.MODID);
public static final DeferredRegister<ParticleType<?>> PARTICLES = DeferredRegister.create(BuiltInRegistries.PARTICLE_TYPE, MODID);
public static final DeferredHolder<ParticleType<?>, SimpleParticleType> ENV_PARTICLE = PARTICLES.register("env_particle",
() -> new SimpleParticleType(false)

2
src/main/java/xyz/robaertschi/environmenttech/level/particle/EnvParticle.java → src/main/java/robaertschi/environmenttech/level/particle/EnvParticle.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.level.particle;
package robaertschi.environmenttech.level.particle;
import org.jetbrains.annotations.NotNull;

7
src/main/java/xyz/robaertschi/environmenttech/menu/ETMenus.java → src/main/java/robaertschi/environmenttech/menu/ETMenus.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.menu;
package robaertschi.environmenttech.menu;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.common.extensions.IMenuTypeExtension;
@ -24,11 +24,10 @@ import net.neoforged.neoforge.registries.DeferredRegister;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.inventory.MenuType;
import xyz.robaertschi.environmenttech.ET;
import static robaertschi.environmenttech.ET.MODID;
public class ETMenus {
public static final DeferredRegister<MenuType<?>> MENUS = DeferredRegister.create(BuiltInRegistries.MENU, ET.MODID);
public static final DeferredRegister<MenuType<?>> MENUS = DeferredRegister.create(BuiltInRegistries.MENU, MODID);
public static final DeferredHolder<MenuType<?>, MenuType<EnvCollectorMenu>> ENV_COLLECTOR_MENU = MENUS.register("env_collector", () ->
IMenuTypeExtension.create((windowId, inv, data) -> new EnvCollectorMenu(windowId, inv.player, data)));

10
src/main/java/xyz/robaertschi/environmenttech/menu/EnvCollectorMenu.java → src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java
View File

@ -14,7 +14,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package xyz.robaertschi.environmenttech.menu;
package 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 xyz.robaertschi.environmenttech.level.block.ETBlocks;
import xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
import robaertschi.environmenttech.level.block.ETBlocks;
import robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity;
import static xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_COUNT;
import static xyz.robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_INPUT;
import static robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_COUNT;
import static robaertschi.environmenttech.level.block.entity.EnvCollectorBlockEntity.SLOT_INPUT;
@SuppressWarnings("SameParameterValue")
public class EnvCollectorMenu extends AbstractContainerMenu {

2
src/main/java/xyz/robaertschi/environmenttech/utils/MouseUtils.java → src/main/java/robaertschi/environmenttech/utils/MouseUtils.java
View File

@ -1,4 +1,4 @@
package xyz.robaertschi.environmenttech.utils;
package robaertschi.environmenttech.utils;
/**
* This file is from <a href="https://github.com/Tutorials-By-Kaupenjoe/Forge-Tutorial-1.19/">here</a>.

7
src/main/resources/META-INF/neoforge.mods.toml
View File

@ -11,7 +11,7 @@ loaderVersion="${loader_version_range}" #mandatory
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
license="${mod_license}"
# A URL to refer people to when problems occur with this mod
issueTrackerURL="https://git.robaertschi.xyz/robaertschi/EnvironmentTech/issues" #optional
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
# A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory
# The modid of the mod
@ -23,11 +23,11 @@ displayName="${mod_name}" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforge.net/docs/misc/updatechecker/
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
# A URL for the "homepage" for this mod, displayed in the mod UI
displayURL="https://git.robaertschi.xyz/robaertschi/EnvironmentTech" #optional
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
# A file name (in the root of the mod JAR) containing a logo for display
#logoFile="environmenttech.png" #optional
# A text field displayed in the mod UI
credits="KaupenJoe, BluSunrize" #optional
#credits="" #optional
# A text field displayed in the mod UI
authors="${mod_authors}" #optional
# Display Test controls the display for your mod in the server connection screen
@ -41,7 +41,6 @@ authors="${mod_authors}" #optional
# The description text for the mod (multi line!) (#mandatory)
description='''${mod_description}'''
# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded.
[[mixins]]
config="environmenttech.mixins.json"

7
src/main/resources/assets/environmenttech/lang/en_us.json
View File

@ -1,13 +1,8 @@
{
"item.environmenttech.env_detector": "ENV Detector",
"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",
"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.",
"block.environmenttech.env_collector": "ENV Collector",
"block.environmenttech.env_distributor": "ENV Distributor",
"fluid_type.environmenttech.env": "ENV",
"itemGroup.environmenttech": "Environment Tech",