diff --git a/src/generated/README.MD b/src/generated/README.MD index 13e70ffa5..2491c3ad9 100644 --- a/src/generated/README.MD +++ b/src/generated/README.MD @@ -1,5 +1,5 @@ The files under this directory should **not** be edited by hand, and any PR's trying to do so -will be closed without warning. Please see the vazkii.botania.common.data package and edit the appropriate datagenerator, +will be closed without warning. Please see the vazkii.botania.data package and edit the appropriate datagenerator, then run the `runData` gradle task to regenerate these files. Basically: src/main/resources = hand-edited, src/generated/resources = `runData`-generated. \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java similarity index 99% rename from src/main/java/vazkii/botania/common/data/BlockLootProvider.java rename to src/main/java/vazkii/botania/data/BlockLootProvider.java index 931f6f362..ab01d1f84 100644 --- a/src/main/java/vazkii/botania/common/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -1,4 +1,4 @@ -package vazkii.botania.common.data; +package vazkii.botania.data; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -12,7 +12,6 @@ import net.minecraft.block.SlabBlock; import net.minecraft.data.DataGenerator; import net.minecraft.data.DirectoryCache; import net.minecraft.data.IDataProvider; -import net.minecraft.data.LootTableProvider; import net.minecraft.enchantment.Enchantments; import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.state.properties.SlabType; diff --git a/src/main/java/vazkii/botania/common/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java similarity index 97% rename from src/main/java/vazkii/botania/common/data/BlockTagProvider.java rename to src/main/java/vazkii/botania/data/BlockTagProvider.java index 505dc4029..8d065e2ff 100644 --- a/src/main/java/vazkii/botania/common/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -1,4 +1,4 @@ -package vazkii.botania.common.data; +package vazkii.botania.data; import net.minecraft.block.Block; import net.minecraft.block.SlabBlock; diff --git a/src/main/java/vazkii/botania/common/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java similarity index 95% rename from src/main/java/vazkii/botania/common/data/DataGenerators.java rename to src/main/java/vazkii/botania/data/DataGenerators.java index 763764bc1..55ede67c7 100644 --- a/src/main/java/vazkii/botania/common/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -1,4 +1,4 @@ -package vazkii.botania.common.data; +package vazkii.botania.data; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/vazkii/botania/common/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java similarity index 95% rename from src/main/java/vazkii/botania/common/data/ItemTagProvider.java rename to src/main/java/vazkii/botania/data/ItemTagProvider.java index f1cf98b3a..8c2b380e4 100644 --- a/src/main/java/vazkii/botania/common/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -1,4 +1,4 @@ -package vazkii.botania.common.data; +package vazkii.botania.data; import net.minecraft.data.DataGenerator; import net.minecraft.data.ItemTagsProvider; diff --git a/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java b/src/main/java/vazkii/botania/data/StonecuttingProvider.java similarity index 98% rename from src/main/java/vazkii/botania/common/data/StonecuttingProvider.java rename to src/main/java/vazkii/botania/data/StonecuttingProvider.java index af7bb2fbf..482ee66b9 100644 --- a/src/main/java/vazkii/botania/common/data/StonecuttingProvider.java +++ b/src/main/java/vazkii/botania/data/StonecuttingProvider.java @@ -1,7 +1,6 @@ -package vazkii.botania.common.data; +package vazkii.botania.data; import com.google.gson.JsonObject; -import net.minecraft.advancements.Advancement; import net.minecraft.block.Block; import net.minecraft.data.DataGenerator; import net.minecraft.data.IFinishedRecipe;