diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java b/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java deleted file mode 100644 index ecb969783..000000000 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/util/BlockUtils.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.momirealms.craftEngineFabricMod.client.util; - -import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; -import net.minecraft.block.Block; -import net.minecraft.client.color.world.BiomeColors; -import net.minecraft.world.biome.FoliageColors; - -public class BlockUtils { - public static void registerColor(Block block) { - - ColorProviderRegistry.BLOCK.register( - (state, world, pos, tintIndex) -> { - if (world != null && pos != null) { - return BiomeColors.getFoliageColor(world, pos); - } - return FoliageColors.DEFAULT; - }, - block - ); - } -} diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/CraftEngineFabricModClient.java b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/CraftEngineFabricModClient.java similarity index 75% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/CraftEngineFabricModClient.java rename to client-mod/src/client/java/net/momirealms/craftengine/fabric/client/CraftEngineFabricModClient.java index c1d5b2f92..6ea917713 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/CraftEngineFabricModClient.java +++ b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/CraftEngineFabricModClient.java @@ -1,19 +1,21 @@ -package net.momirealms.craftEngineFabricMod.client; +package net.momirealms.craftengine.fabric.client; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.minecraft.block.Block; +import net.minecraft.client.color.world.BiomeColors; import net.minecraft.client.gui.screen.DisconnectedScreen; import net.minecraft.client.render.RenderLayer; import net.minecraft.registry.Registries; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.momirealms.craftEngineFabricMod.client.config.ModConfig; -import net.momirealms.craftEngineFabricMod.client.network.CraftEnginePayload; -import net.momirealms.craftEngineFabricMod.client.util.BlockUtils; +import net.minecraft.world.biome.FoliageColors; +import net.momirealms.craftengine.fabric.client.config.ModConfig; +import net.momirealms.craftengine.fabric.client.network.CraftEnginePayload; import java.nio.charset.StandardCharsets; @@ -28,7 +30,7 @@ public class CraftEngineFabricModClient implements ClientModInitializer { if (id.getNamespace().equals(CraftEngineFabricModClient.MOD_ID)) { BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getCutoutMipped()); if (id.getPath().contains("leaves")) { - BlockUtils.registerColor(block); + registerColor(block); } } }); @@ -57,4 +59,16 @@ public class CraftEngineFabricModClient implements ClientModInitializer { }); }); } + + public static void registerColor(Block block) { + ColorProviderRegistry.BLOCK.register( + (state, world, pos, tintIndex) -> { + if (world != null && pos != null) { + return BiomeColors.getFoliageColor(world, pos); + } + return FoliageColors.DEFAULT; + }, + block + ); + } } diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModConfig.java b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModConfig.java similarity index 95% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModConfig.java rename to client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModConfig.java index 3e4342517..6546896d6 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModConfig.java +++ b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModConfig.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.client.config; +package net.momirealms.craftengine.fabric.client.config; import me.shedaniel.clothconfig2.api.ConfigBuilder; import me.shedaniel.clothconfig2.api.ConfigCategory; diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModMenuIntegration.java b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModMenuIntegration.java similarity index 83% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModMenuIntegration.java rename to client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModMenuIntegration.java index 730b58a45..7378fe979 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/config/ModMenuIntegration.java +++ b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/config/ModMenuIntegration.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.client.config; +package net.momirealms.craftengine.fabric.client.config; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/ByteArrayCodec.java b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/ByteArrayCodec.java similarity index 89% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/ByteArrayCodec.java rename to client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/ByteArrayCodec.java index 28782f35d..314baa358 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/ByteArrayCodec.java +++ b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/ByteArrayCodec.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.client.network; +package net.momirealms.craftengine.fabric.client.network; import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.codec.PacketCodec; diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/CraftEnginePayload.java b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/CraftEnginePayload.java similarity index 92% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/CraftEnginePayload.java rename to client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/CraftEnginePayload.java index da4a971f8..b8b27ff44 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/client/network/CraftEnginePayload.java +++ b/client-mod/src/client/java/net/momirealms/craftengine/fabric/client/network/CraftEnginePayload.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.client.network; +package net.momirealms.craftengine.fabric.client.network; import net.minecraft.network.RegistryByteBuf; import net.minecraft.network.codec.PacketCodec; diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/CraftEngineFabricMod.java similarity index 88% rename from client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java rename to client-mod/src/main/java/net/momirealms/craftEngine/fabric/CraftEngineFabricMod.java index 3fef9d282..e47e27e11 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/CraftEngineFabricMod.java +++ b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/CraftEngineFabricMod.java @@ -1,14 +1,14 @@ -package net.momirealms.craftEngineFabricMod; +package net.momirealms.craftEngine.fabric; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.BlockState; import net.minecraft.util.Identifier; -import net.momirealms.craftEngineFabricMod.client.config.ModConfig; -import net.momirealms.craftEngineFabricMod.util.BlockUtils; -import net.momirealms.craftEngineFabricMod.util.LoggerFilter; -import net.momirealms.craftEngineFabricMod.util.RegisterBlocks; -import net.momirealms.craftEngineFabricMod.util.YamlUtils; +import net.momirealms.craftEngine.fabric.util.BlockUtils; +import net.momirealms.craftEngine.fabric.util.LoggerFilter; +import net.momirealms.craftEngine.fabric.util.RegisterBlocks; +import net.momirealms.craftEngine.fabric.util.YamlUtils; +import net.momirealms.craftengine.fabric.client.config.ModConfig; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/BlockUtils.java b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/BlockUtils.java similarity index 96% rename from client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/BlockUtils.java rename to client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/BlockUtils.java index 2e58963b5..d9ad1633f 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/BlockUtils.java +++ b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/BlockUtils.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.util; +package net.momirealms.craftEngine.fabric.util; import net.minecraft.block.AbstractBlock; import net.minecraft.block.BlockState; @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; + import static java.util.Objects.requireNonNull; public class BlockUtils { diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/LoggerFilter.java b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/LoggerFilter.java similarity index 93% rename from client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/LoggerFilter.java rename to client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/LoggerFilter.java index 1c6c45c00..b92c03779 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/LoggerFilter.java +++ b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/LoggerFilter.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.util; +package net.momirealms.craftEngine.fabric.util; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LogEvent; diff --git a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/RegisterBlocks.java similarity index 91% rename from client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java rename to client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/RegisterBlocks.java index 79ee25203..4c248577c 100644 --- a/client-mod/src/main/java/net/momirealms/craftEngineFabricMod/util/RegisterBlocks.java +++ b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/RegisterBlocks.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.util; +package net.momirealms.craftEngine.fabric.util; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; @@ -7,7 +7,7 @@ import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -import net.momirealms.craftEngineFabricMod.CraftEngineFabricMod; +import net.momirealms.craftEngine.fabric.CraftEngineFabricMod; import java.util.function.Function; diff --git a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/util/YamlUtils.java b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/YamlUtils.java similarity index 99% rename from client-mod/src/client/java/net/momirealms/craftEngineFabricMod/util/YamlUtils.java rename to client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/YamlUtils.java index 0b938535b..3907b338d 100644 --- a/client-mod/src/client/java/net/momirealms/craftEngineFabricMod/util/YamlUtils.java +++ b/client-mod/src/main/java/net/momirealms/craftEngine/fabric/util/YamlUtils.java @@ -1,4 +1,4 @@ -package net.momirealms.craftEngineFabricMod.util; +package net.momirealms.craftEngine.fabric.util; import com.mojang.brigadier.StringReader; import net.minecraft.block.Block;