From 69b6c9271339d7586f95a921ddd96ea18bd3984a Mon Sep 17 00:00:00 2001 From: Commoble Date: Sun, 25 Feb 2024 18:14:06 -0500 Subject: [PATCH] Move everything to the net.commoble package --- .../BlockStateDataGenExampleMod.java | 18 +++++++++--------- .../examplecontent/DataBuddyExampleMod.java | 2 +- .../examplecontent/ExampleConfig.java | 4 ++-- .../databuddy/examplecontent/FlavorTags.java | 2 +- .../RegistryDispatcherExampleMod.java | 2 +- .../databuddy/codec/NullableFieldCodec.java | 2 +- .../databuddy/codec/RegistryDispatcher.java | 2 +- .../databuddy/codec/WriteFieldsFirstOps.java | 2 +- .../databuddy/config/ConfigHelper.java | 2 +- .../databuddy/data/CodecJsonDataManager.java | 2 +- .../data/MergeableCodecDataManager.java | 2 +- .../databuddy/datagen/BlockStateFile.java | 2 +- .../databuddy/datagen/JsonDataProvider.java | 2 +- .../databuddy/datagen/SimpleModel.java | 2 +- .../commoble/databuddy/nbt/NBTListCodec.java | 2 +- .../commoble/databuddy/nbt/NBTMapCodec.java | 2 +- .../databuddy/plugin/PluginLoader.java | 2 +- .../databuddy/codec/NullableFieldTests.java | 1 + .../codec/WriteFieldsFirstOpsTest.java | 2 ++ .../databuddy/config/TomlConfigOpsTests.java | 2 +- 20 files changed, 30 insertions(+), 27 deletions(-) rename src/main/java/{ => net}/commoble/databuddy/codec/NullableFieldCodec.java (99%) rename src/main/java/{ => net}/commoble/databuddy/codec/RegistryDispatcher.java (99%) rename src/main/java/{ => net}/commoble/databuddy/codec/WriteFieldsFirstOps.java (99%) rename src/main/java/{ => net}/commoble/databuddy/config/ConfigHelper.java (99%) rename src/main/java/{ => net}/commoble/databuddy/data/CodecJsonDataManager.java (99%) rename src/main/java/{ => net}/commoble/databuddy/data/MergeableCodecDataManager.java (99%) rename src/main/java/{ => net}/commoble/databuddy/datagen/BlockStateFile.java (99%) rename src/main/java/{ => net}/commoble/databuddy/datagen/JsonDataProvider.java (98%) rename src/main/java/{ => net}/commoble/databuddy/datagen/SimpleModel.java (99%) rename src/main/java/{ => net}/commoble/databuddy/nbt/NBTListCodec.java (99%) rename src/main/java/{ => net}/commoble/databuddy/nbt/NBTMapCodec.java (99%) rename src/main/java/{ => net}/commoble/databuddy/plugin/PluginLoader.java (99%) diff --git a/src/examplemod/java/commoble/databuddy/examplecontent/BlockStateDataGenExampleMod.java b/src/examplemod/java/commoble/databuddy/examplecontent/BlockStateDataGenExampleMod.java index 5779c6b..950adde 100644 --- a/src/examplemod/java/commoble/databuddy/examplecontent/BlockStateDataGenExampleMod.java +++ b/src/examplemod/java/commoble/databuddy/examplecontent/BlockStateDataGenExampleMod.java @@ -4,15 +4,15 @@ import com.mojang.serialization.JsonOps; -import commoble.databuddy.datagen.BlockStateFile; -import commoble.databuddy.datagen.BlockStateFile.Case; -import commoble.databuddy.datagen.BlockStateFile.Model; -import commoble.databuddy.datagen.BlockStateFile.Multipart; -import commoble.databuddy.datagen.BlockStateFile.OrCase; -import commoble.databuddy.datagen.BlockStateFile.PropertyValue; -import commoble.databuddy.datagen.BlockStateFile.Variants; -import commoble.databuddy.datagen.BlockStateFile.WhenApply; -import commoble.databuddy.datagen.SimpleModel; +import net.commoble.databuddy.datagen.BlockStateFile; +import net.commoble.databuddy.datagen.SimpleModel; +import net.commoble.databuddy.datagen.BlockStateFile.Case; +import net.commoble.databuddy.datagen.BlockStateFile.Model; +import net.commoble.databuddy.datagen.BlockStateFile.Multipart; +import net.commoble.databuddy.datagen.BlockStateFile.OrCase; +import net.commoble.databuddy.datagen.BlockStateFile.PropertyValue; +import net.commoble.databuddy.datagen.BlockStateFile.Variants; +import net.commoble.databuddy.datagen.BlockStateFile.WhenApply; import net.minecraft.Util; import net.minecraft.client.resources.model.BlockModelRotation; import net.minecraft.core.registries.Registries; diff --git a/src/examplemod/java/commoble/databuddy/examplecontent/DataBuddyExampleMod.java b/src/examplemod/java/commoble/databuddy/examplecontent/DataBuddyExampleMod.java index d4599fc..b5a5798 100644 --- a/src/examplemod/java/commoble/databuddy/examplecontent/DataBuddyExampleMod.java +++ b/src/examplemod/java/commoble/databuddy/examplecontent/DataBuddyExampleMod.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import commoble.databuddy.config.ConfigHelper; +import net.commoble.databuddy.config.ConfigHelper; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; import net.neoforged.fml.config.ModConfig; diff --git a/src/examplemod/java/commoble/databuddy/examplecontent/ExampleConfig.java b/src/examplemod/java/commoble/databuddy/examplecontent/ExampleConfig.java index d9cfeaa..d37d105 100644 --- a/src/examplemod/java/commoble/databuddy/examplecontent/ExampleConfig.java +++ b/src/examplemod/java/commoble/databuddy/examplecontent/ExampleConfig.java @@ -6,8 +6,8 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import commoble.databuddy.config.ConfigHelper; -import commoble.databuddy.config.ConfigHelper.ConfigObject; +import net.commoble.databuddy.config.ConfigHelper; +import net.commoble.databuddy.config.ConfigHelper.ConfigObject; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.common.ModConfigSpec; diff --git a/src/examplemod/java/commoble/databuddy/examplecontent/FlavorTags.java b/src/examplemod/java/commoble/databuddy/examplecontent/FlavorTags.java index 588f35c..e1d6538 100644 --- a/src/examplemod/java/commoble/databuddy/examplecontent/FlavorTags.java +++ b/src/examplemod/java/commoble/databuddy/examplecontent/FlavorTags.java @@ -6,7 +6,7 @@ import com.google.common.collect.Sets; -import commoble.databuddy.data.MergeableCodecDataManager; +import net.commoble.databuddy.data.MergeableCodecDataManager; import net.minecraft.resources.ResourceLocation; public class FlavorTags diff --git a/src/examplemod/java/commoble/databuddy/examplecontent/RegistryDispatcherExampleMod.java b/src/examplemod/java/commoble/databuddy/examplecontent/RegistryDispatcherExampleMod.java index 1a83602..87af8a5 100644 --- a/src/examplemod/java/commoble/databuddy/examplecontent/RegistryDispatcherExampleMod.java +++ b/src/examplemod/java/commoble/databuddy/examplecontent/RegistryDispatcherExampleMod.java @@ -9,7 +9,7 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.JsonOps; -import commoble.databuddy.codec.RegistryDispatcher; +import net.commoble.databuddy.codec.RegistryDispatcher; import net.minecraft.resources.ResourceLocation; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.ModList; diff --git a/src/main/java/commoble/databuddy/codec/NullableFieldCodec.java b/src/main/java/net/commoble/databuddy/codec/NullableFieldCodec.java similarity index 99% rename from src/main/java/commoble/databuddy/codec/NullableFieldCodec.java rename to src/main/java/net/commoble/databuddy/codec/NullableFieldCodec.java index cd3c7b0..166b986 100644 --- a/src/main/java/commoble/databuddy/codec/NullableFieldCodec.java +++ b/src/main/java/net/commoble/databuddy/codec/NullableFieldCodec.java @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ -package commoble.databuddy.codec; +package net.commoble.databuddy.codec; import java.util.Optional; diff --git a/src/main/java/commoble/databuddy/codec/RegistryDispatcher.java b/src/main/java/net/commoble/databuddy/codec/RegistryDispatcher.java similarity index 99% rename from src/main/java/commoble/databuddy/codec/RegistryDispatcher.java rename to src/main/java/net/commoble/databuddy/codec/RegistryDispatcher.java index 9571814..3e4d7ae 100644 --- a/src/main/java/commoble/databuddy/codec/RegistryDispatcher.java +++ b/src/main/java/net/commoble/databuddy/codec/RegistryDispatcher.java @@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal SOFTWARE. */ -package commoble.databuddy.codec; +package net.commoble.databuddy.codec; import java.util.function.Consumer; import java.util.function.Function; diff --git a/src/main/java/commoble/databuddy/codec/WriteFieldsFirstOps.java b/src/main/java/net/commoble/databuddy/codec/WriteFieldsFirstOps.java similarity index 99% rename from src/main/java/commoble/databuddy/codec/WriteFieldsFirstOps.java rename to src/main/java/net/commoble/databuddy/codec/WriteFieldsFirstOps.java index 683d5e1..df62065 100644 --- a/src/main/java/commoble/databuddy/codec/WriteFieldsFirstOps.java +++ b/src/main/java/net/commoble/databuddy/codec/WriteFieldsFirstOps.java @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ -package commoble.databuddy.codec; +package net.commoble.databuddy.codec; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/commoble/databuddy/config/ConfigHelper.java b/src/main/java/net/commoble/databuddy/config/ConfigHelper.java similarity index 99% rename from src/main/java/commoble/databuddy/config/ConfigHelper.java rename to src/main/java/net/commoble/databuddy/config/ConfigHelper.java index 2507742..d3c05f6 100644 --- a/src/main/java/commoble/databuddy/config/ConfigHelper.java +++ b/src/main/java/net/commoble/databuddy/config/ConfigHelper.java @@ -21,7 +21,7 @@ of this software and associated documentation files (the "Software"), to deal // DataFixerUpper is Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license. */ -package commoble.databuddy.config; +package net.commoble.databuddy.config; import java.time.temporal.Temporal; import java.util.ArrayList; diff --git a/src/main/java/commoble/databuddy/data/CodecJsonDataManager.java b/src/main/java/net/commoble/databuddy/data/CodecJsonDataManager.java similarity index 99% rename from src/main/java/commoble/databuddy/data/CodecJsonDataManager.java rename to src/main/java/net/commoble/databuddy/data/CodecJsonDataManager.java index fa309c2..d19fe87 100644 --- a/src/main/java/commoble/databuddy/data/CodecJsonDataManager.java +++ b/src/main/java/net/commoble/databuddy/data/CodecJsonDataManager.java @@ -1,4 +1,4 @@ -package commoble.databuddy.data; +package net.commoble.databuddy.data; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/commoble/databuddy/data/MergeableCodecDataManager.java b/src/main/java/net/commoble/databuddy/data/MergeableCodecDataManager.java similarity index 99% rename from src/main/java/commoble/databuddy/data/MergeableCodecDataManager.java rename to src/main/java/net/commoble/databuddy/data/MergeableCodecDataManager.java index 7c8f14f..01e75fb 100644 --- a/src/main/java/commoble/databuddy/data/MergeableCodecDataManager.java +++ b/src/main/java/net/commoble/databuddy/data/MergeableCodecDataManager.java @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ -package commoble.databuddy.data; +package net.commoble.databuddy.data; import java.io.Reader; import java.util.ArrayList; diff --git a/src/main/java/commoble/databuddy/datagen/BlockStateFile.java b/src/main/java/net/commoble/databuddy/datagen/BlockStateFile.java similarity index 99% rename from src/main/java/commoble/databuddy/datagen/BlockStateFile.java rename to src/main/java/net/commoble/databuddy/datagen/BlockStateFile.java index b53e024..1919708 100644 --- a/src/main/java/commoble/databuddy/datagen/BlockStateFile.java +++ b/src/main/java/net/commoble/databuddy/datagen/BlockStateFile.java @@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal SOFTWARE. */ -package commoble.databuddy.datagen; +package net.commoble.databuddy.datagen; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/commoble/databuddy/datagen/JsonDataProvider.java b/src/main/java/net/commoble/databuddy/datagen/JsonDataProvider.java similarity index 98% rename from src/main/java/commoble/databuddy/datagen/JsonDataProvider.java rename to src/main/java/net/commoble/databuddy/datagen/JsonDataProvider.java index cd22474..c39a350 100644 --- a/src/main/java/commoble/databuddy/datagen/JsonDataProvider.java +++ b/src/main/java/net/commoble/databuddy/datagen/JsonDataProvider.java @@ -19,7 +19,7 @@ of this software and associated documentation files (the "Software"), to deal SOFTWARE. */ -package commoble.databuddy.datagen; +package net.commoble.databuddy.datagen; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/commoble/databuddy/datagen/SimpleModel.java b/src/main/java/net/commoble/databuddy/datagen/SimpleModel.java similarity index 99% rename from src/main/java/commoble/databuddy/datagen/SimpleModel.java rename to src/main/java/net/commoble/databuddy/datagen/SimpleModel.java index f06c945..811b364 100644 --- a/src/main/java/commoble/databuddy/datagen/SimpleModel.java +++ b/src/main/java/net/commoble/databuddy/datagen/SimpleModel.java @@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal SOFTWARE. */ -package commoble.databuddy.datagen; +package net.commoble.databuddy.datagen; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/commoble/databuddy/nbt/NBTListCodec.java b/src/main/java/net/commoble/databuddy/nbt/NBTListCodec.java similarity index 99% rename from src/main/java/commoble/databuddy/nbt/NBTListCodec.java rename to src/main/java/net/commoble/databuddy/nbt/NBTListCodec.java index 6cd2485..8a7f744 100644 --- a/src/main/java/commoble/databuddy/nbt/NBTListCodec.java +++ b/src/main/java/net/commoble/databuddy/nbt/NBTListCodec.java @@ -24,7 +24,7 @@ of this software and associated documentation files (the "Software"), to deal */ -package commoble.databuddy.nbt; +package net.commoble.databuddy.nbt; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/commoble/databuddy/nbt/NBTMapCodec.java b/src/main/java/net/commoble/databuddy/nbt/NBTMapCodec.java similarity index 99% rename from src/main/java/commoble/databuddy/nbt/NBTMapCodec.java rename to src/main/java/net/commoble/databuddy/nbt/NBTMapCodec.java index dee058b..9858693 100644 --- a/src/main/java/commoble/databuddy/nbt/NBTMapCodec.java +++ b/src/main/java/net/commoble/databuddy/nbt/NBTMapCodec.java @@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal SOFTWARE. */ -package commoble.databuddy.nbt; +package net.commoble.databuddy.nbt; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/commoble/databuddy/plugin/PluginLoader.java b/src/main/java/net/commoble/databuddy/plugin/PluginLoader.java similarity index 99% rename from src/main/java/commoble/databuddy/plugin/PluginLoader.java rename to src/main/java/net/commoble/databuddy/plugin/PluginLoader.java index 0f46db9..4c79103 100644 --- a/src/main/java/commoble/databuddy/plugin/PluginLoader.java +++ b/src/main/java/net/commoble/databuddy/plugin/PluginLoader.java @@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal * */ -package commoble.databuddy.plugin; +package net.commoble.databuddy.plugin; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/commoble/databuddy/codec/NullableFieldTests.java b/src/test/java/commoble/databuddy/codec/NullableFieldTests.java index 8d6edc7..17a68ac 100644 --- a/src/test/java/commoble/databuddy/codec/NullableFieldTests.java +++ b/src/test/java/commoble/databuddy/codec/NullableFieldTests.java @@ -12,6 +12,7 @@ import com.mojang.serialization.JsonOps; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.commoble.databuddy.codec.NullableFieldCodec; import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; diff --git a/src/test/java/commoble/databuddy/codec/WriteFieldsFirstOpsTest.java b/src/test/java/commoble/databuddy/codec/WriteFieldsFirstOpsTest.java index ce8f2e5..66a068f 100644 --- a/src/test/java/commoble/databuddy/codec/WriteFieldsFirstOpsTest.java +++ b/src/test/java/commoble/databuddy/codec/WriteFieldsFirstOpsTest.java @@ -12,6 +12,8 @@ import com.mojang.serialization.JsonOps; import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.commoble.databuddy.codec.WriteFieldsFirstOps; + public class WriteFieldsFirstOpsTest { private static interface StringProviderType extends Supplier> diff --git a/src/test/java/commoble/databuddy/config/TomlConfigOpsTests.java b/src/test/java/commoble/databuddy/config/TomlConfigOpsTests.java index 7d05cb7..2016b47 100644 --- a/src/test/java/commoble/databuddy/config/TomlConfigOpsTests.java +++ b/src/test/java/commoble/databuddy/config/TomlConfigOpsTests.java @@ -13,7 +13,7 @@ import com.mojang.serialization.DataResult; import com.mojang.serialization.codecs.RecordCodecBuilder; -import commoble.databuddy.config.ConfigHelper.TomlConfigOps; +import net.commoble.databuddy.config.ConfigHelper.TomlConfigOps; public class TomlConfigOpsTests {