From aa320f7067f1e0ff8f3e65a8cf7177064a9192ba Mon Sep 17 00:00:00 2001 From: Colin Wong Date: Wed, 13 Jan 2021 19:10:44 +0000 Subject: [PATCH 1/4] It's building! --- build.gradle | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 59dffc87..5ace2789 100644 --- a/build.gradle +++ b/build.gradle @@ -46,9 +46,6 @@ repositories { maven { url "https://maven.chaosfield.at/" } - maven { - url "http://maven.ic2.player.to/" - } maven { url "https://maven.tterrag.com" } @@ -56,10 +53,10 @@ repositories { url = "https://maven.thiakil.com" } maven { - url "https://tehnut.info/maven/" + url "https://maven.amadornes.com/" } maven { - url "https://maven.amadornes.com/" + url "https://www.cursemaven.com" } } @@ -107,7 +104,7 @@ dependencies { deobfCompile("slimeknights:TConstruct:1.12.2-2.12.0.+") { exclude group: 'mezz.jei' } - deobfCompile('net.sengir.forestry:forestry_1.12.2:5.+') { + deobfCompile('curse.maven:forestry-59751:2918418') { exclude group: 'mezz.jei' } deobfCompile "team.chisel.ctm:CTM:MC1.12.2-0.3.2.20" @@ -115,8 +112,8 @@ dependencies { exclude group: 'mezz.jei' } deobfCompile "team.chisel:Chisel:MC1.12.2-0.2.0.31" - deobfCompile "com.wayoftime.bloodmagic:BloodMagic:1.12.2-2.3.3-101" - deobfCompile "info.amerifrance.guideapi:Guide-API:1.12-2.1.7-62" + deobfCompile "curse.maven:bloodmagic-224791:2610083" + deobfCompile "curse.maven:guideapi-228832:2645993" deobfCompile("knightminer:Inspirations:1.12.2-0.2.4.70") { exclude group: 'mezz.jei' } From 55efad9bf0eb4962cb48d1ef67a2cb82c5f1ebf7 Mon Sep 17 00:00:00 2001 From: Colin Wong Date: Wed, 13 Jan 2021 20:05:52 +0000 Subject: [PATCH 2/4] Update deps --- build.gradle | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 5ace2789..d4f218b9 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ repositories { url "https://www.ryanliptak.com/maven/" } maven { - url "https://maven.chaosfield.at/" + url "https://maven.ellpeck.de/" } maven { url "https://maven.tterrag.com" @@ -61,41 +61,41 @@ repositories { } dependencies { - deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554" - deobfCompile "mezz.jei:jei_1.12.2:4.14.4.264" - deobfCompile "com.blamejared:MTLib:3.0.4.8" + deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.613" + deobfCompile "mezz.jei:jei_1.12.2:4.16.1.302" + deobfCompile "com.blamejared:MTLib:3.0.5.15" deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2" - deobfCompile "vazkii.botania:Botania:r1.10-357.7" + deobfCompile "vazkii.botania:Botania:r1.10-363.148" - deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.3.41:universal") { + deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.4.43:universal") { exclude group: 'mezz.jei' } - deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.2.25:universal") { + deobfCompile("cofh:ThermalFoundation:1.12.2-2.6.3.27:universal") { exclude group: 'mezz.jei' } - deobfCompile("cofh:CoFHCore:1.12.2-4.6.2.24:universal") { + deobfCompile("cofh:CoFHCore:1.12.2-4.6.3.27:universal") { exclude group: 'mezz.jei' } - deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.6:universal") { + deobfCompile("cofh:RedstoneFlux:1.12-2.1.0.7:universal") { exclude group: 'mezz.jei' } - deobfCompile("cofh:CoFHWorld:1.12.2-1.3.0.6:universal") { + deobfCompile("cofh:CoFHWorld:1.12.2-1.3.1.7:universal") { exclude group: 'mezz.jei' } - deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.2.353:universal") { + deobfCompile("codechicken:CodeChickenLib:1.12.2-3.2.3.358:universal") { exclude group: 'mezz.jei' } - deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.15-995") { + deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.23-4") { exclude group: 'mezz.jei' } - deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r142") { + deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16") { exclude group: 'mezz.jei' } deobfCompile("slimeknights.mantle:Mantle:1.12-1.3.3.+") { @@ -107,17 +107,17 @@ dependencies { deobfCompile('curse.maven:forestry-59751:2918418') { exclude group: 'mezz.jei' } - deobfCompile "team.chisel.ctm:CTM:MC1.12.2-0.3.2.20" + deobfCompile "team.chisel.ctm:CTM:MC1.12.2-1.0.2.31" deobfCompile("knightminer.tcomplement:TinkersComplement:1.12.2-0.4.2.39") { exclude group: 'mezz.jei' } - deobfCompile "team.chisel:Chisel:MC1.12.2-0.2.0.31" + deobfCompile "team.chisel:Chisel:MC1.12.2-1.0.2.45" deobfCompile "curse.maven:bloodmagic-224791:2610083" deobfCompile "curse.maven:guideapi-228832:2645993" - deobfCompile("knightminer:Inspirations:1.12.2-0.2.4.70") { + deobfCompile("knightminer:Inspirations:1.12.2-0.2.9.9") { exclude group: 'mezz.jei' } - deobfCompile "blusunrize:ImmersiveEngineering:0.12-89-518" + deobfCompile "blusunrize:ImmersiveEngineering:0.12-92-559" } processResources { From 95802b8fe2b740e84050b1a5b500d490a31284f5 Mon Sep 17 00:00:00 2001 From: Colin Wong Date: Wed, 13 Jan 2021 20:32:10 +0000 Subject: [PATCH 3/4] Fix warnings --- .../com/blamejared/compat/actuallyaddition/Compost.java | 1 + .../java/com/blamejared/compat/betterwithmods/Anvil.java | 2 +- .../java/com/blamejared/compat/betterwithmods/Bellows.java | 1 - .../com/blamejared/compat/betterwithmods/Cauldron.java | 4 ---- .../com/blamejared/compat/betterwithmods/Crucible.java | 4 ---- .../com/blamejared/compat/betterwithmods/HeatRegistry.java | 1 + .../java/com/blamejared/compat/betterwithmods/Hopper.java | 1 - .../java/com/blamejared/compat/betterwithmods/Kiln.java | 4 ---- .../java/com/blamejared/compat/betterwithmods/Mill.java | 4 ---- .../java/com/blamejared/compat/betterwithmods/Misc.java | 5 ----- .../com/blamejared/compat/betterwithmods/Movement.java | 1 + .../java/com/blamejared/compat/betterwithmods/Saw.java | 1 - .../com/blamejared/compat/betterwithmods/Turntable.java | 1 - .../base/blockrecipes/BlockRecipeBuilder.java | 5 ++--- .../base/blockrecipes/BlockRecipeRemoveInput.java | 4 ---- .../betterwithmods/base/blockrecipes/TurntableBuilder.java | 5 +---- .../betterwithmods/base/bulkrecipes/MillBuilder.java | 2 -- .../com/blamejared/compat/botania/LocalizationHelper.java | 2 +- .../com/blamejared/compat/botania/handlers/Orechid.java | 1 - .../com/blamejared/compat/botania/handlers/PureDaisy.java | 3 +-- .../compat/botania/lexicon/RemoveRecipeMapping.java | 7 ------- .../blamejared/compat/botania/lexicon/SetCategoryIcon.java | 2 -- .../compat/botania/lexicon/SetCategoryPriority.java | 5 ++--- .../compat/botania/lexicon/pages/AddPageCrafting.java | 5 ----- .../compat/botania/lexicon/pages/AddPageElven.java | 1 - .../compat/botania/lexicon/pages/AddPageEntity.java | 6 ------ .../compat/botania/lexicon/pages/AddPageImage.java | 2 -- .../compat/botania/lexicon/pages/AddPageText.java | 6 ------ src/main/java/com/blamejared/compat/chisel/Chisel.java | 3 --- .../java/com/blamejared/compat/forestry/Carpenter.java | 1 + .../java/com/blamejared/compat/forestry/Fermenter.java | 4 ---- src/main/java/com/blamejared/compat/forestry/Squeezer.java | 5 ----- src/main/java/com/blamejared/compat/forestry/Still.java | 1 - .../blamejared/compat/forestry/ThermionicFabricator.java | 2 -- .../java/com/blamejared/compat/immersivetech/Boiler.java | 1 - .../com/blamejared/compat/immersivetech/Distiller.java | 1 - .../java/com/blamejared/compat/tconstruct/Melting.java | 1 - .../thaumcraft/handlers/brackets/BracketHandlerAspect.java | 2 -- .../thaumcraft/handlers/expand/IEntityAspectExpansion.java | 2 ++ .../thaumcraft/handlers/expand/IItemAspectExpansion.java | 5 ++--- .../thaumcraft/handlers/handlers/ArcaneWorkbench.java | 1 - .../compat/thaumcraft/handlers/handlers/Crucible.java | 1 - 42 files changed, 16 insertions(+), 100 deletions(-) diff --git a/src/main/java/com/blamejared/compat/actuallyaddition/Compost.java b/src/main/java/com/blamejared/compat/actuallyaddition/Compost.java index 17ff4e6e..74d139ea 100644 --- a/src/main/java/com/blamejared/compat/actuallyaddition/Compost.java +++ b/src/main/java/com/blamejared/compat/actuallyaddition/Compost.java @@ -25,6 +25,7 @@ @ZenRegister public class Compost { + @SuppressWarnings("deprecation") @ZenMethod public static void addRecipe(IItemStack output, IItemStack outputDisplay, IIngredient input, IItemStack inputDisplay) { if(!InputHelper.isABlock(outputDisplay) || !InputHelper.isABlock(inputDisplay)) { diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Anvil.java b/src/main/java/com/blamejared/compat/betterwithmods/Anvil.java index 5ab1060a..7277420f 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Anvil.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Anvil.java @@ -99,7 +99,7 @@ public static Object[] toShapedAnvilObjects(IIngredient[][] ingredients) { if(ingredients == null) return null; else { - ArrayList prep = new ArrayList(); + ArrayList prep = new ArrayList<>(); char chr = 'a'; for(int y = 0; y < 4; y++) { StringBuilder matrix = new StringBuilder(); diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Bellows.java b/src/main/java/com/blamejared/compat/betterwithmods/Bellows.java index af031650..435b8461 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Bellows.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Bellows.java @@ -1,7 +1,6 @@ package com.blamejared.compat.betterwithmods; import betterwithmods.common.registry.BellowsManager; -import betterwithmods.module.hardcore.world.HCBuoy; import betterwithmods.util.item.Stack; import betterwithmods.util.item.StackMap; import com.blamejared.ModTweaker; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java b/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java index bfd50378..af39e95e 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Cauldron.java @@ -2,8 +2,6 @@ import betterwithmods.common.BWRegistry; -import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk; -import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe; import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; @@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.function.Supplier; - @ZenClass("mods.betterwithmods.Cauldron") @ModOnly("betterwithmods") @ZenRegister diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java b/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java index ed01550b..186a6cbf 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Crucible.java @@ -2,8 +2,6 @@ import betterwithmods.common.BWRegistry; -import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk; -import betterwithmods.common.registry.bulk.recipes.CookingPotRecipe; import com.blamejared.compat.betterwithmods.base.bulkrecipes.CookingPotBuilder; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; @@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.function.Supplier; - @ZenClass("mods.betterwithmods.Crucible") @ModOnly("betterwithmods") @ZenRegister diff --git a/src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java b/src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java index cdbd6540..4fcd9fc6 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/HeatRegistry.java @@ -26,6 +26,7 @@ public static void addHeatSource(crafttweaker.api.block.IBlockState state, int h CraftTweakerAPI.apply(new AddHeatSource(CraftTweakerMC.getBlockState(state), heat)); } + @SuppressWarnings("deprecation") @ZenMethod public static void addHeatSource(IItemStack stack, int heat) { if (InputHelper.isABlock(stack)) { diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java b/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java index fa1c2df6..a63e766c 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java @@ -4,7 +4,6 @@ import betterwithmods.common.BWRegistry; import betterwithmods.common.registry.HopperFilter; import betterwithmods.common.registry.HopperInteractions; -import betterwithmods.module.gameplay.HopperRecipes; import com.blamejared.ModTweaker; import com.blamejared.mtlib.helpers.LogHelper; import com.blamejared.mtlib.utils.BaseAction; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Kiln.java b/src/main/java/com/blamejared/compat/betterwithmods/Kiln.java index 343f1f5f..1b33cfaa 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Kiln.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Kiln.java @@ -3,12 +3,9 @@ import betterwithmods.common.BWMRecipes; import betterwithmods.common.BWRegistry; import betterwithmods.common.registry.KilnStructureManager; -import betterwithmods.common.registry.block.managers.CraftingManagerBlock; -import betterwithmods.common.registry.block.recipe.KilnRecipe; import com.blamejared.ModTweaker; import com.blamejared.compat.betterwithmods.base.blockrecipes.KilnBuilder; import com.blamejared.mtlib.helpers.InputHelper; -import com.blamejared.mtlib.helpers.LogHelper; import com.blamejared.mtlib.utils.BaseAction; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; @@ -20,7 +17,6 @@ import stanhebben.zenscript.annotations.ZenMethod; import javax.annotation.Nonnull; -import java.util.function.Supplier; @ZenClass("mods.betterwithmods.Kiln") @ModOnly("betterwithmods") diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Mill.java b/src/main/java/com/blamejared/compat/betterwithmods/Mill.java index 17fc80ff..721d31a5 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Mill.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Mill.java @@ -2,8 +2,6 @@ import betterwithmods.common.BWRegistry; -import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk; -import betterwithmods.common.registry.bulk.recipes.MillRecipe; import com.blamejared.compat.betterwithmods.base.bulkrecipes.MillBuilder; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; @@ -13,8 +11,6 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.function.Supplier; - @ZenClass("mods.betterwithmods.Mill") @ModOnly("betterwithmods") @ZenRegister diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Misc.java b/src/main/java/com/blamejared/compat/betterwithmods/Misc.java index 14cdef71..aa62791b 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Misc.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Misc.java @@ -1,17 +1,12 @@ package com.blamejared.compat.betterwithmods; -import betterwithmods.common.registry.BellowsManager; import betterwithmods.module.hardcore.crafting.HCFurnace; -import betterwithmods.util.item.Stack; -import betterwithmods.util.item.StackMap; import com.blamejared.ModTweaker; import com.blamejared.mtlib.utils.BaseMapAddition; -import com.google.common.collect.Maps; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; import crafttweaker.api.minecraft.CraftTweakerMC; -import crafttweaker.mc1120.CraftTweaker; import net.minecraft.item.crafting.Ingredient; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Movement.java b/src/main/java/com/blamejared/compat/betterwithmods/Movement.java index 14895583..22a1a869 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Movement.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Movement.java @@ -19,6 +19,7 @@ @ZenRegister public class Movement { + @SuppressWarnings("deprecation") @ZenMethod public static void set(IItemStack input, float speed) { ItemStack stack = InputHelper.toStack(input); diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Saw.java b/src/main/java/com/blamejared/compat/betterwithmods/Saw.java index d268accc..02fb69c7 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Saw.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Saw.java @@ -3,7 +3,6 @@ import betterwithmods.common.BWRegistry; import com.blamejared.compat.betterwithmods.base.blockrecipes.SawBuilder; -import com.blamejared.mtlib.helpers.LogHelper; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java b/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java index 34f0ca60..a4af7fe2 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Turntable.java @@ -3,7 +3,6 @@ import betterwithmods.common.BWMRecipes; import betterwithmods.common.BWRegistry; import com.blamejared.compat.betterwithmods.base.blockrecipes.TurntableBuilder; -import com.blamejared.mtlib.helpers.LogHelper; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; import crafttweaker.api.item.IIngredient; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeBuilder.java b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeBuilder.java index a6393ac1..f67b7bb2 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeBuilder.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeBuilder.java @@ -7,7 +7,6 @@ import com.blamejared.ModTweaker; import com.blamejared.compat.betterwithmods.base.RemoveAll; import com.blamejared.mtlib.helpers.InputHelper; -import com.blamejared.mtlib.helpers.LogHelper; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; import crafttweaker.api.minecraft.CraftTweakerMC; @@ -49,13 +48,13 @@ public void _buildRecipe(IIngredient input, IItemStack[] outputs) { } @ZenMethod - public BlockRecipeBuilder setInputBlockDrop(IItemStack input) { + public BlockRecipeBuilder setInputBlockDrop(IItemStack input) { this.input = new BlockDropIngredient(CraftTweakerMC.getItemStack(input)); return this; } @ZenMethod - public BlockRecipeBuilder setInputBlockDrop(IItemStack[] inputs) { + public BlockRecipeBuilder setInputBlockDrop(IItemStack[] inputs) { this.input = new BlockDropIngredient(CraftTweakerMC.getItemStacks(inputs)); return this; } diff --git a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeRemoveInput.java b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeRemoveInput.java index c1b098bb..c2005a78 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeRemoveInput.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/BlockRecipeRemoveInput.java @@ -5,13 +5,9 @@ import com.blamejared.mtlib.helpers.InputHelper; import com.blamejared.mtlib.helpers.LogHelper; import com.blamejared.mtlib.utils.BaseAction; -import com.google.common.collect.Lists; import crafttweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; -import java.util.List; -import java.util.stream.Collectors; - public class BlockRecipeRemoveInput extends BaseAction { private final ItemStack input; diff --git a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/TurntableBuilder.java b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/TurntableBuilder.java index 77c2a2ad..68c94ec2 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/TurntableBuilder.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/base/blockrecipes/TurntableBuilder.java @@ -1,9 +1,7 @@ package com.blamejared.compat.betterwithmods.base.blockrecipes; -import betterwithmods.common.BWMRecipes; import betterwithmods.common.BWRegistry; import betterwithmods.common.registry.block.managers.CraftingManagerBlock; -import betterwithmods.common.registry.block.recipe.BlockRecipe; import betterwithmods.common.registry.block.recipe.TurntableRecipe; import com.blamejared.ModTweaker; import com.blamejared.mtlib.helpers.InputHelper; @@ -13,10 +11,8 @@ import crafttweaker.api.item.IItemStack; import crafttweaker.api.minecraft.CraftTweakerMC; import net.minecraft.block.Block; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenMethod; import java.util.function.Supplier; @@ -35,6 +31,7 @@ public TurntableBuilder setRotations(int rotations) { return this; } + @SuppressWarnings("deprecation") @ZenMethod public TurntableBuilder setProductState(IItemStack productState) { if (InputHelper.isABlock(productState)) { diff --git a/src/main/java/com/blamejared/compat/betterwithmods/base/bulkrecipes/MillBuilder.java b/src/main/java/com/blamejared/compat/betterwithmods/base/bulkrecipes/MillBuilder.java index 13560524..8057f7d7 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/base/bulkrecipes/MillBuilder.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/base/bulkrecipes/MillBuilder.java @@ -4,8 +4,6 @@ import betterwithmods.common.registry.bulk.recipes.MillRecipe; import crafttweaker.api.item.IIngredient; import crafttweaker.api.item.IItemStack; -import net.minecraft.util.SoundEvent; -import net.minecraftforge.fml.common.registry.ForgeRegistries; import stanhebben.zenscript.annotations.ZenMethod; import java.util.function.Supplier; diff --git a/src/main/java/com/blamejared/compat/botania/LocalizationHelper.java b/src/main/java/com/blamejared/compat/botania/LocalizationHelper.java index 22eb6c9d..e4aaf283 100644 --- a/src/main/java/com/blamejared/compat/botania/LocalizationHelper.java +++ b/src/main/java/com/blamejared/compat/botania/LocalizationHelper.java @@ -7,7 +7,7 @@ public class LocalizationHelper { - + @SuppressWarnings("unchecked") public static void setLocale(String unlocalized, String localized) { try { Field locale = I18n.class.getDeclaredField("i18nLocale"); diff --git a/src/main/java/com/blamejared/compat/botania/handlers/Orechid.java b/src/main/java/com/blamejared/compat/botania/handlers/Orechid.java index 08c50fc1..c1371f56 100644 --- a/src/main/java/com/blamejared/compat/botania/handlers/Orechid.java +++ b/src/main/java/com/blamejared/compat/botania/handlers/Orechid.java @@ -1,7 +1,6 @@ package com.blamejared.compat.botania.handlers; import com.blamejared.ModTweaker; -import crafttweaker.CraftTweakerAPI; import crafttweaker.IAction; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; diff --git a/src/main/java/com/blamejared/compat/botania/handlers/PureDaisy.java b/src/main/java/com/blamejared/compat/botania/handlers/PureDaisy.java index bd4b2959..ca4fdc75 100644 --- a/src/main/java/com/blamejared/compat/botania/handlers/PureDaisy.java +++ b/src/main/java/com/blamejared/compat/botania/handlers/PureDaisy.java @@ -19,8 +19,6 @@ import crafttweaker.api.liquid.ILiquidStack; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; @@ -39,6 +37,7 @@ public static void addRecipe(IIngredient blockInput, IItemStack blockOutput) { addRecipe(blockInput, blockOutput, 150); } + @SuppressWarnings("deprecation") @ZenMethod public static void addRecipe(IIngredient blockInput, IItemStack blockOutput, int time) { if(blockInput == null || blockOutput == null) { diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/RemoveRecipeMapping.java b/src/main/java/com/blamejared/compat/botania/lexicon/RemoveRecipeMapping.java index c638b43b..f1174085 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/RemoveRecipeMapping.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/RemoveRecipeMapping.java @@ -6,16 +6,12 @@ import crafttweaker.IAction; import crafttweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; -import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; public class RemoveRecipeMapping implements IAction { private ItemStack stack; private IItemStack iStack; - private LexiconEntry entry; - private int page; public RemoveRecipeMapping(IItemStack stack) { this.iStack = stack; @@ -27,9 +23,6 @@ public void apply() { CraftTweakerAPI.getLogger().logError("There isn't a recipe mapping for " + iStack); return; } - EntryData data = LexiconRecipeMappings.getDataForStack(stack); - this.entry = data.entry; - this.page = data.page; LexiconRecipeMappings.remove(stack); CraftTweakerAPI.getLogger().logInfo("Removing Lexicon Recipe Lookup: " + stack.getUnlocalizedName()); } diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryIcon.java b/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryIcon.java index e4cec109..98d4688e 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryIcon.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryIcon.java @@ -10,7 +10,6 @@ public class SetCategoryIcon implements IAction { private LexiconCategory category; - private ResourceLocation oldIcon; private ResourceLocation newIcon; private final String name; @@ -26,7 +25,6 @@ public void apply() { CraftTweakerAPI.getLogger().logError("Cannot find lexicon category " + name); return; } - oldIcon = category.getIcon(); category.setIcon(newIcon); CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category icon: " + category.getUnlocalizedName()); } diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryPriority.java b/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryPriority.java index a441d840..5dbf1b14 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryPriority.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/SetCategoryPriority.java @@ -4,7 +4,6 @@ import crafttweaker.CraftTweakerAPI; import crafttweaker.IAction; -import crafttweaker.mc1120.brackets.BracketHandlerItem; import vazkii.botania.api.lexicon.LexiconCategory; public class SetCategoryPriority implements IAction { @@ -28,12 +27,12 @@ public void apply() { } oldPriority = category.getSortingPriority(); category.setPriority(newPriority); - CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category priority: " + category.getUnlocalizedName()); + CraftTweakerAPI.getLogger().logInfo("Setting Lexicon Category priority from " + oldPriority + " to: " + category.getUnlocalizedName()); } @Override public String describe() { - return "Attempting to set the priority for Lexicon Category " + name + " to " + newPriority; + return "Attempting to set the priority for Lexicon Category " + name + " from " + oldPriority + "to " + newPriority; } } diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageCrafting.java b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageCrafting.java index a675bad5..d8418d93 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageCrafting.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageCrafting.java @@ -2,17 +2,12 @@ import com.blamejared.compat.botania.BotaniaHelper; import crafttweaker.*; -import crafttweaker.api.item.IIngredient; import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.*; -import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.lexicon.page.*; import java.util.*; -import static com.blamejared.mtlib.helpers.InputHelper.toObjects; - public class AddPageCrafting implements IAction { private String name; diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageElven.java b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageElven.java index 47e79ee6..ce6b549a 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageElven.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageElven.java @@ -3,7 +3,6 @@ import com.blamejared.compat.botania.BotaniaHelper; import crafttweaker.*; import crafttweaker.api.item.*; -import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.*; import vazkii.botania.api.recipe.*; import vazkii.botania.common.lexicon.page.*; diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageEntity.java b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageEntity.java index 6929682c..d3a100dd 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageEntity.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageEntity.java @@ -2,17 +2,11 @@ import com.blamejared.compat.botania.BotaniaHelper; import crafttweaker.*; -import crafttweaker.api.item.*; import net.minecraft.entity.EntityList; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.lexicon.*; -import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.common.lexicon.page.*; -import java.util.*; - -import static com.blamejared.mtlib.helpers.InputHelper.*; - public class AddPageEntity implements IAction { private String name; diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageImage.java b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageImage.java index e1b3b8b7..b8a06244 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageImage.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageImage.java @@ -2,8 +2,6 @@ import com.blamejared.compat.botania.BotaniaHelper; import crafttweaker.*; -import net.minecraft.entity.EntityList; -import net.minecraft.util.ResourceLocation; import vazkii.botania.api.lexicon.*; import vazkii.botania.common.lexicon.page.*; diff --git a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageText.java b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageText.java index 5639ba59..426dce56 100644 --- a/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageText.java +++ b/src/main/java/com/blamejared/compat/botania/lexicon/pages/AddPageText.java @@ -2,15 +2,9 @@ import com.blamejared.compat.botania.BotaniaHelper; import crafttweaker.*; -import crafttweaker.api.item.*; import vazkii.botania.api.lexicon.*; -import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.common.lexicon.page.*; -import java.util.*; - -import static com.blamejared.mtlib.helpers.InputHelper.*; - public class AddPageText implements IAction { private String name; diff --git a/src/main/java/com/blamejared/compat/chisel/Chisel.java b/src/main/java/com/blamejared/compat/chisel/Chisel.java index 85e52704..25300b09 100644 --- a/src/main/java/com/blamejared/compat/chisel/Chisel.java +++ b/src/main/java/com/blamejared/compat/chisel/Chisel.java @@ -4,9 +4,6 @@ import crafttweaker.mc1120.commands.*; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; -import net.minecraft.util.text.TextFormatting; -import slimeknights.tconstruct.library.TinkerRegistry; -import slimeknights.tconstruct.library.materials.*; import team.chisel.api.carving.CarvingUtils; import static crafttweaker.mc1120.commands.SpecialMessagesChat.*; diff --git a/src/main/java/com/blamejared/compat/forestry/Carpenter.java b/src/main/java/com/blamejared/compat/forestry/Carpenter.java index 472be467..45365ef5 100644 --- a/src/main/java/com/blamejared/compat/forestry/Carpenter.java +++ b/src/main/java/com/blamejared/compat/forestry/Carpenter.java @@ -46,6 +46,7 @@ public static void addRecipe(IItemStack output, IIngredient[][] ingredients, int ModTweaker.LATE_ADDITIONS.add(new Add(new CarpenterRecipe(packagingTime, toFluid(fluidInput), toStack(box), new ShapedRecipeCustom(toStack(output), toShapedObjects(ingredients))))); } + @SuppressWarnings("unused") private static IItemStack[][] transform(IItemStack[] arr, int N) { int M = (arr.length + N - 1) / N; IItemStack[][] mat = new IItemStack[M][]; diff --git a/src/main/java/com/blamejared/compat/forestry/Fermenter.java b/src/main/java/com/blamejared/compat/forestry/Fermenter.java index 95ada6de..e938f47c 100644 --- a/src/main/java/com/blamejared/compat/forestry/Fermenter.java +++ b/src/main/java/com/blamejared/compat/forestry/Fermenter.java @@ -17,11 +17,7 @@ import forestry.api.recipes.IFermenterRecipe; import forestry.api.recipes.RecipeManagers; import forestry.factory.recipes.FermenterRecipe; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/com/blamejared/compat/forestry/Squeezer.java b/src/main/java/com/blamejared/compat/forestry/Squeezer.java index 4fb6734c..535be67e 100644 --- a/src/main/java/com/blamejared/compat/forestry/Squeezer.java +++ b/src/main/java/com/blamejared/compat/forestry/Squeezer.java @@ -10,19 +10,14 @@ import crafttweaker.api.item.IItemStack; import crafttweaker.api.item.WeightedItemStack; import crafttweaker.api.liquid.ILiquidStack; -import crafttweaker.mc1120.item.MCItemStack; -import crafttweaker.mc1120.liquid.MCLiquidStack; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; -import forestry.core.fluids.FluidHelper; import forestry.factory.recipes.*; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import java.util.*; - import static com.blamejared.mtlib.helpers.InputHelper.*; import static com.blamejared.mtlib.helpers.StackHelper.matches; diff --git a/src/main/java/com/blamejared/compat/forestry/Still.java b/src/main/java/com/blamejared/compat/forestry/Still.java index 6236f4b3..2c66aa6d 100644 --- a/src/main/java/com/blamejared/compat/forestry/Still.java +++ b/src/main/java/com/blamejared/compat/forestry/Still.java @@ -6,7 +6,6 @@ import com.blamejared.mtlib.utils.BaseRemoveForestry; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; -import crafttweaker.api.item.IIngredient; import crafttweaker.api.liquid.ILiquidStack; import forestry.api.recipes.IStillRecipe; import forestry.api.recipes.RecipeManagers; diff --git a/src/main/java/com/blamejared/compat/forestry/ThermionicFabricator.java b/src/main/java/com/blamejared/compat/forestry/ThermionicFabricator.java index d269e026..7d7aa407 100644 --- a/src/main/java/com/blamejared/compat/forestry/ThermionicFabricator.java +++ b/src/main/java/com/blamejared/compat/forestry/ThermionicFabricator.java @@ -17,8 +17,6 @@ import forestry.factory.recipes.FabricatorSmeltingRecipe; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/com/blamejared/compat/immersivetech/Boiler.java b/src/main/java/com/blamejared/compat/immersivetech/Boiler.java index e98b7aba..2a227968 100644 --- a/src/main/java/com/blamejared/compat/immersivetech/Boiler.java +++ b/src/main/java/com/blamejared/compat/immersivetech/Boiler.java @@ -7,7 +7,6 @@ import crafttweaker.annotations.ZenRegister; import crafttweaker.api.liquid.ILiquidStack; import ferro2000.immersivetech.api.craftings.BoilerRecipes; -import ferro2000.immersivetech.api.craftings.SolarTowerRecipes; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/com/blamejared/compat/immersivetech/Distiller.java b/src/main/java/com/blamejared/compat/immersivetech/Distiller.java index bf2f43e7..cc02adb4 100644 --- a/src/main/java/com/blamejared/compat/immersivetech/Distiller.java +++ b/src/main/java/com/blamejared/compat/immersivetech/Distiller.java @@ -13,7 +13,6 @@ import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.definitions.zenclasses.ParsedZenClassMethod; @ZenClass("mods.immersivetech.Distiller") @ZenRegister diff --git a/src/main/java/com/blamejared/compat/tconstruct/Melting.java b/src/main/java/com/blamejared/compat/tconstruct/Melting.java index f8c249c8..31bd9e55 100644 --- a/src/main/java/com/blamejared/compat/tconstruct/Melting.java +++ b/src/main/java/com/blamejared/compat/tconstruct/Melting.java @@ -21,7 +21,6 @@ import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.library.events.TinkerRegisterEvent; -import slimeknights.tconstruct.library.smeltery.MeltingRecipe; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.*; diff --git a/src/main/java/com/blamejared/compat/thaumcraft/handlers/brackets/BracketHandlerAspect.java b/src/main/java/com/blamejared/compat/thaumcraft/handlers/brackets/BracketHandlerAspect.java index 519bce0e..2bb9d04f 100644 --- a/src/main/java/com/blamejared/compat/thaumcraft/handlers/brackets/BracketHandlerAspect.java +++ b/src/main/java/com/blamejared/compat/thaumcraft/handlers/brackets/BracketHandlerAspect.java @@ -26,8 +26,6 @@ public BracketHandlerAspect() { method = CraftTweakerAPI.getJavaMethod(BracketHandlerAspect.class, "getAspect", String.class); } - - @SuppressWarnings("unchecked") public static void rebuildRegistry() { aspects.clear(); Aspect.aspects.forEach(aspects::put); diff --git a/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IEntityAspectExpansion.java b/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IEntityAspectExpansion.java index 01cf2daf..dc01a2f7 100644 --- a/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IEntityAspectExpansion.java +++ b/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IEntityAspectExpansion.java @@ -15,6 +15,7 @@ @ZenRegister public class IEntityAspectExpansion { + @SuppressWarnings("deprecation") @ZenMethod public static void setAspects(IEntityDefinition definition, CTAspectStack... aspects) { ModTweaker.LATE_ADDITIONS.add(new BaseAction("Aspects") { @@ -43,6 +44,7 @@ private String getAspects() { }); } + @SuppressWarnings("deprecation") @ZenMethod public static void removeAspects(IEntityDefinition definition, CTAspectStack... aspects) { ModTweaker.LATE_REMOVALS.add(new BaseAction("Aspects") { diff --git a/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IItemAspectExpansion.java b/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IItemAspectExpansion.java index 32756134..7a406ecb 100644 --- a/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IItemAspectExpansion.java +++ b/src/main/java/com/blamejared/compat/thaumcraft/handlers/expand/IItemAspectExpansion.java @@ -10,13 +10,12 @@ import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.AspectList; -import java.util.*; - @ZenExpansion("crafttweaker.item.IItemStack") @ModOnly("thaumcraft") @ZenRegister public class IItemAspectExpansion { + @SuppressWarnings("deprecation") @ZenMethod public static void setAspects(IItemStack stack, CTAspectStack... aspects) { ModTweaker.LATE_ADDITIONS.add(new BaseAction("Aspects") { @@ -46,7 +45,7 @@ private String getAspects() { } - + @SuppressWarnings("deprecation") @ZenMethod public static void removeAspects(IItemStack stack, CTAspectStack... aspects) { ModTweaker.LATE_REMOVALS.add(new BaseAction("Aspects") { diff --git a/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/ArcaneWorkbench.java b/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/ArcaneWorkbench.java index 8da669b5..1920d1d8 100644 --- a/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/ArcaneWorkbench.java +++ b/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/ArcaneWorkbench.java @@ -5,7 +5,6 @@ import com.blamejared.compat.thaumcraft.handlers.aspects.CTAspectStack; import com.blamejared.mtlib.helpers.*; import com.blamejared.mtlib.utils.BaseAction; -import com.blamejared.reference.Reference; import crafttweaker.annotations.*; import crafttweaker.api.item.*; import crafttweaker.api.minecraft.CraftTweakerMC; diff --git a/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/Crucible.java b/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/Crucible.java index 3dca9575..1a0d51be 100644 --- a/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/Crucible.java +++ b/src/main/java/com/blamejared/compat/thaumcraft/handlers/handlers/Crucible.java @@ -5,7 +5,6 @@ import com.blamejared.compat.thaumcraft.handlers.aspects.CTAspectStack; import com.blamejared.mtlib.helpers.InputHelper; import com.blamejared.mtlib.utils.BaseAction; -import com.blamejared.reference.Reference; import crafttweaker.annotations.*; import crafttweaker.api.item.*; import net.minecraft.item.ItemStack; From 3c6ca7c11063d8604b91bcb466114f65d2fa9b69 Mon Sep 17 00:00:00 2001 From: Colin Wong Date: Thu, 9 Jul 2020 19:37:19 -0500 Subject: [PATCH 4/4] Add soul use recipe --- .../compat/betterwithmods/Hopper.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java b/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java index a63e766c..a374da1d 100644 --- a/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java +++ b/src/main/java/com/blamejared/compat/betterwithmods/Hopper.java @@ -48,6 +48,15 @@ public static void addFilterRecipe(String name, IIngredient input, IItemStack[] Lists.newArrayList(CraftTweakerMC.getItemStacks(outputs)), Lists.newArrayList(CraftTweakerMC.getItemStacks(secondary)))); } + + @ZenMethod + public static void addSoulUseRecipe(String name, IIngredient input, int soulAmount, IItemStack[] outputs, IItemStack[] secondary) { + ModTweaker.LATE_ADDITIONS.add(new AddSoulUseRecipe(name, + CraftTweakerMC.getIngredient(input), + soulAmount, + Lists.newArrayList(CraftTweakerMC.getItemStacks(outputs)), + Lists.newArrayList(CraftTweakerMC.getItemStacks(secondary)))); + } @ZenMethod public static void addSoulUrnRecipe(IIngredient input, IItemStack[] outputs, IItemStack[] secondary) { @@ -184,6 +193,38 @@ public void apply() { HopperInteractions.addHopperRecipe(new HopperInteractions.HopperRecipe(filterName,input,outputs,secondary)); } } + + public static class AddSoulUseRecipe extends BaseAction { + String filterName; + Ingredient input; + int soulAmount; + List outputs; + List secondary; + + public AddSoulUseRecipe(String filterName, Ingredient input, int soulAmount, List outputs, List secondary) { + super("Filtered Hopper"); + this.filterName = filterName; + this.input = input; + this.soulAmount = soulAmount; + this.outputs = outputs; + this.secondary = secondary; + } + + @Override + protected String getRecipeInfo() { + return String.format("%s -> %s,%s in %s with %s souls", + Arrays.toString(input.getMatchingStacks()), + outputs.stream().map(ItemStack::getDisplayName).collect(Collectors.joining(",")), + secondary.stream().map(ItemStack::getDisplayName).collect(Collectors.joining(",")), + filterName, + String.valueOf(soulAmount)); + } + + @Override + public void apply() { + HopperInteractions.addHopperRecipe(new HopperInteractions.SoulUseRecipe(filterName,input,soulAmount,outputs,secondary)); + } + } public static class AddSoulUrnRecipe extends BaseAction { Ingredient input;