From 633c3e7b4d68ba90bd500930ff49d843ff55807c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Jul 2019 20:37:48 -0700 Subject: [PATCH] Move jei integration out temporarily for compiling, update mods.toml --- .../client/integration/jei => jei}/JEIBotaniaPlugin.java | 0 .../integration/jei => jei}/brewery/BreweryRecipeCategory.java | 0 .../jei => jei}/crafting/AncientWillRecipeWrapper.java | 0 .../jei => jei}/crafting/CompositeLensRecipeWrapper.java | 0 .../jei => jei}/crafting/TerraPickTippingRecipeWrapper.java | 0 .../jei => jei}/elventrade/ElvenTradeRecipeCategory.java | 0 .../jei => jei}/manapool/ManaPoolRecipeCategory.java | 0 .../jei => jei}/orechid/OrechidIgnemRecipeCategory.java | 0 .../jei => jei}/orechid/OrechidIgnemRecipeWrapper.java | 0 .../integration/jei => jei}/orechid/OrechidRecipeCategory.java | 0 .../integration/jei => jei}/orechid/OrechidRecipeWrapper.java | 0 .../petalapothecary/PetalApothecaryRecipeCategory.java | 0 .../jei => jei}/puredaisy/PureDaisyRecipeCategory.java | 0 .../jei => jei}/runicaltar/RunicAltarRecipeCategory.java | 0 src/main/resources/META-INF/mods.toml | 2 +- 15 files changed, 1 insertion(+), 1 deletion(-) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/JEIBotaniaPlugin.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/brewery/BreweryRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/crafting/AncientWillRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/crafting/CompositeLensRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/crafting/TerraPickTippingRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/elventrade/ElvenTradeRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/manapool/ManaPoolRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/orechid/OrechidIgnemRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/orechid/OrechidIgnemRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/orechid/OrechidRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/orechid/OrechidRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/petalapothecary/PetalApothecaryRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/puredaisy/PureDaisyRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration/jei => jei}/runicaltar/RunicAltarRecipeCategory.java (100%) diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/jei/JEIBotaniaPlugin.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java rename to jei/JEIBotaniaPlugin.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/jei/brewery/BreweryRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java rename to jei/brewery/BreweryRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java b/jei/crafting/AncientWillRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java rename to jei/crafting/AncientWillRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java b/jei/crafting/CompositeLensRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java rename to jei/crafting/CompositeLensRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java b/jei/crafting/TerraPickTippingRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java rename to jei/crafting/TerraPickTippingRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/jei/elventrade/ElvenTradeRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java rename to jei/elventrade/ElvenTradeRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/jei/manapool/ManaPoolRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java rename to jei/manapool/ManaPoolRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java b/jei/orechid/OrechidIgnemRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java rename to jei/orechid/OrechidIgnemRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java b/jei/orechid/OrechidIgnemRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java rename to jei/orechid/OrechidIgnemRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java b/jei/orechid/OrechidRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java rename to jei/orechid/OrechidRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java b/jei/orechid/OrechidRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java rename to jei/orechid/OrechidRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/jei/petalapothecary/PetalApothecaryRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java rename to jei/petalapothecary/PetalApothecaryRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/jei/puredaisy/PureDaisyRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java rename to jei/puredaisy/PureDaisyRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/jei/runicaltar/RunicAltarRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java rename to jei/runicaltar/RunicAltarRecipeCategory.java diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index baa33c950..a1565a176 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" #mandatory -loaderVersion="[25,)" +loaderVersion="[27,)" issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional displayURL="https://botaniamod.net" #optional logoFile="logo.png" #optional