From f8c80d519e5de09cb8d5a9c42575ae5621cb4d07 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 Mar 2020 17:26:54 -0500 Subject: [PATCH] Organize datagenerators a bit --- src/main/java/vazkii/botania/data/DataGenerators.java | 1 + .../java/vazkii/botania/data/{ => recipes}/BrewProvider.java | 2 +- .../vazkii/botania/data/{ => recipes}/ElvenTradeProvider.java | 2 +- .../botania/data/{ => recipes}/ManaInfusionProvider.java | 2 +- .../vazkii/botania/data/{ => recipes}/PureDaisyProvider.java | 3 +-- .../java/vazkii/botania/data/{ => recipes}/RecipeProvider.java | 2 +- .../vazkii/botania/data/{ => recipes}/SmeltingProvider.java | 2 +- .../botania/data/{ => recipes}/StonecuttingProvider.java | 2 +- .../java/vazkii/botania/data/{ => recipes}/WrapperResult.java | 2 +- src/main/java/vazkii/botania/data/recipes/package-info.java | 3 +++ 10 files changed, 12 insertions(+), 9 deletions(-) rename src/main/java/vazkii/botania/data/{ => recipes}/BrewProvider.java (99%) rename src/main/java/vazkii/botania/data/{ => recipes}/ElvenTradeProvider.java (99%) rename src/main/java/vazkii/botania/data/{ => recipes}/ManaInfusionProvider.java (99%) rename src/main/java/vazkii/botania/data/{ => recipes}/PureDaisyProvider.java (98%) rename src/main/java/vazkii/botania/data/{ => recipes}/RecipeProvider.java (99%) rename src/main/java/vazkii/botania/data/{ => recipes}/SmeltingProvider.java (98%) rename src/main/java/vazkii/botania/data/{ => recipes}/StonecuttingProvider.java (99%) rename src/main/java/vazkii/botania/data/{ => recipes}/WrapperResult.java (98%) create mode 100644 src/main/java/vazkii/botania/data/recipes/package-info.java diff --git a/src/main/java/vazkii/botania/data/DataGenerators.java b/src/main/java/vazkii/botania/data/DataGenerators.java index 6d5710647..1251b161d 100644 --- a/src/main/java/vazkii/botania/data/DataGenerators.java +++ b/src/main/java/vazkii/botania/data/DataGenerators.java @@ -13,6 +13,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.GatherDataEvent; import vazkii.botania.common.lib.LibMisc; +import vazkii.botania.data.recipes.*; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class DataGenerators { diff --git a/src/main/java/vazkii/botania/data/BrewProvider.java b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java similarity index 99% rename from src/main/java/vazkii/botania/data/BrewProvider.java rename to src/main/java/vazkii/botania/data/recipes/BrewProvider.java index d44ec98cc..3c3c9cf08 100644 --- a/src/main/java/vazkii/botania/data/BrewProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java @@ -1,4 +1,4 @@ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/vazkii/botania/data/ElvenTradeProvider.java b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java similarity index 99% rename from src/main/java/vazkii/botania/data/ElvenTradeProvider.java rename to src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java index b573567ec..1a859bfa7 100644 --- a/src/main/java/vazkii/botania/data/ElvenTradeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonArray; import com.google.gson.JsonObject; diff --git a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java similarity index 99% rename from src/main/java/vazkii/botania/data/ManaInfusionProvider.java rename to src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 2370b7096..f1b5c97e9 100644 --- a/src/main/java/vazkii/botania/data/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonObject; diff --git a/src/main/java/vazkii/botania/data/PureDaisyProvider.java b/src/main/java/vazkii/botania/data/recipes/PureDaisyProvider.java similarity index 98% rename from src/main/java/vazkii/botania/data/PureDaisyProvider.java rename to src/main/java/vazkii/botania/data/recipes/PureDaisyProvider.java index 03193ddfa..6f5e11f93 100644 --- a/src/main/java/vazkii/botania/data/PureDaisyProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/PureDaisyProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.common.base.Preconditions; import com.google.gson.JsonObject; @@ -18,7 +18,6 @@ import net.minecraft.data.IFinishedRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.Rotation; import net.minecraftforge.common.Tags; import vazkii.botania.api.recipe.StateIngredient; diff --git a/src/main/java/vazkii/botania/data/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java similarity index 99% rename from src/main/java/vazkii/botania/data/RecipeProvider.java rename to src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 64fd14573..15c75054f 100644 --- a/src/main/java/vazkii/botania/data/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonArray; diff --git a/src/main/java/vazkii/botania/data/SmeltingProvider.java b/src/main/java/vazkii/botania/data/recipes/SmeltingProvider.java similarity index 98% rename from src/main/java/vazkii/botania/data/SmeltingProvider.java rename to src/main/java/vazkii/botania/data/recipes/SmeltingProvider.java index feb3642fa..8f42ba9b7 100644 --- a/src/main/java/vazkii/botania/data/SmeltingProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/SmeltingProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import net.minecraft.data.CookingRecipeBuilder; import net.minecraft.data.DataGenerator; diff --git a/src/main/java/vazkii/botania/data/StonecuttingProvider.java b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java similarity index 99% rename from src/main/java/vazkii/botania/data/StonecuttingProvider.java rename to src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java index 0b55cd980..071172789 100644 --- a/src/main/java/vazkii/botania/data/StonecuttingProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/StonecuttingProvider.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonObject; diff --git a/src/main/java/vazkii/botania/data/WrapperResult.java b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java similarity index 98% rename from src/main/java/vazkii/botania/data/WrapperResult.java rename to src/main/java/vazkii/botania/data/recipes/WrapperResult.java index 140b6fc02..80c6c8eaa 100644 --- a/src/main/java/vazkii/botania/data/WrapperResult.java +++ b/src/main/java/vazkii/botania/data/recipes/WrapperResult.java @@ -6,7 +6,7 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.data; +package vazkii.botania.data.recipes; import com.google.gson.JsonObject; diff --git a/src/main/java/vazkii/botania/data/recipes/package-info.java b/src/main/java/vazkii/botania/data/recipes/package-info.java new file mode 100644 index 000000000..6ce39f44c --- /dev/null +++ b/src/main/java/vazkii/botania/data/recipes/package-info.java @@ -0,0 +1,3 @@ +@javax.annotation.ParametersAreNonnullByDefault +@mcp.MethodsReturnNonnullByDefault +package vazkii.botania.data.recipes;