From 873850148c8fb4b3e9c899e9e8610f1e77dae6e7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Jun 2020 20:17:32 -0500 Subject: [PATCH] Fix dispose modifier, move JEI integration to disabled folder --- .../vazkii/botania/common/core/loot/DisposeModifier.java | 6 +++--- .../integration => src_disabled}/jei/JEIBotaniaPlugin.java | 0 .../jei/brewery/BreweryRecipeCategory.java | 0 .../jei/crafting/AncientWillRecipeWrapper.java | 0 .../jei/crafting/CompositeLensRecipeWrapper.java | 0 .../jei/crafting/TerraPickTippingRecipeWrapper.java | 0 .../jei/elventrade/ElvenTradeRecipeCategory.java | 0 .../jei/manapool/ManaPoolRecipeCategory.java | 0 .../jei/orechid/OrechidIgnemRecipeCategory.java | 0 .../jei/orechid/OrechidIgnemRecipeWrapper.java | 0 .../jei/orechid/OrechidRecipeCategory.java | 0 .../jei/orechid/OrechidRecipeCategoryBase.java | 0 .../jei/orechid/OrechidRecipeWrapper.java | 0 .../jei/petalapothecary/PetalApothecaryRecipeCategory.java | 0 .../jei/puredaisy/PureDaisyRecipeCategory.java | 0 .../jei/runicaltar/RunicAltarRecipeCategory.java | 0 16 files changed, 3 insertions(+), 3 deletions(-) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/JEIBotaniaPlugin.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/brewery/BreweryRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/crafting/AncientWillRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/crafting/CompositeLensRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/crafting/TerraPickTippingRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/elventrade/ElvenTradeRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/manapool/ManaPoolRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/orechid/OrechidIgnemRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/orechid/OrechidIgnemRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/orechid/OrechidRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/orechid/OrechidRecipeCategoryBase.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/orechid/OrechidRecipeWrapper.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/petalapothecary/PetalApothecaryRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/puredaisy/PureDaisyRecipeCategory.java (100%) rename {src/main/java/vazkii/botania/client/integration => src_disabled}/jei/runicaltar/RunicAltarRecipeCategory.java (100%) diff --git a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java index 35a0e3218..c39e881b7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java +++ b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java @@ -12,10 +12,10 @@ import com.google.gson.JsonObject; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; +import net.minecraft.loot.conditions.ILootCondition; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameters; -import net.minecraft.world.storage.loot.conditions.ILootCondition; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.common.loot.LootModifier; import net.minecraftforge.event.RegistryEvent; diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src_disabled/jei/JEIBotaniaPlugin.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java rename to src_disabled/jei/JEIBotaniaPlugin.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src_disabled/jei/brewery/BreweryRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java rename to src_disabled/jei/brewery/BreweryRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java b/src_disabled/jei/crafting/AncientWillRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/AncientWillRecipeWrapper.java rename to src_disabled/jei/crafting/AncientWillRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java b/src_disabled/jei/crafting/CompositeLensRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/CompositeLensRecipeWrapper.java rename to src_disabled/jei/crafting/CompositeLensRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java b/src_disabled/jei/crafting/TerraPickTippingRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/crafting/TerraPickTippingRecipeWrapper.java rename to src_disabled/jei/crafting/TerraPickTippingRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src_disabled/jei/elventrade/ElvenTradeRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java rename to src_disabled/jei/elventrade/ElvenTradeRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src_disabled/jei/manapool/ManaPoolRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java rename to src_disabled/jei/manapool/ManaPoolRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java b/src_disabled/jei/orechid/OrechidIgnemRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeCategory.java rename to src_disabled/jei/orechid/OrechidIgnemRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java b/src_disabled/jei/orechid/OrechidIgnemRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidIgnemRecipeWrapper.java rename to src_disabled/jei/orechid/OrechidIgnemRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java b/src_disabled/jei/orechid/OrechidRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategory.java rename to src_disabled/jei/orechid/OrechidRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategoryBase.java b/src_disabled/jei/orechid/OrechidRecipeCategoryBase.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeCategoryBase.java rename to src_disabled/jei/orechid/OrechidRecipeCategoryBase.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java b/src_disabled/jei/orechid/OrechidRecipeWrapper.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/orechid/OrechidRecipeWrapper.java rename to src_disabled/jei/orechid/OrechidRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src_disabled/jei/petalapothecary/PetalApothecaryRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java rename to src_disabled/jei/petalapothecary/PetalApothecaryRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src_disabled/jei/puredaisy/PureDaisyRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java rename to src_disabled/jei/puredaisy/PureDaisyRecipeCategory.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src_disabled/jei/runicaltar/RunicAltarRecipeCategory.java similarity index 100% rename from src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java rename to src_disabled/jei/runicaltar/RunicAltarRecipeCategory.java