diff --git a/build.gradle b/build.gradle index 827dfc7..242d25c 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ compileJava { } minecraft { - version = "1.12.2-14.23.4.2705" + version = "1.12.2-14.23.4.2749" runDir = "run" mappings = "snapshot_20180407" useDepAts = true @@ -70,10 +70,10 @@ dependencies { deobfCompile "vazkii.botania:Botania:r1.10-355.4" - deobfCompile("cofh:ThermalExpansion:1.12.2-5.4.2.27:universal") { + deobfCompile("cofh:ThermalExpansion:1.12.2-5.5.0.29:universal") { exclude group: 'mezz.jei' } - deobfCompile("betterwithmods:BetterWithMods:1.12-2.1.16-568") { + deobfCompile("betterwithmods:BetterWithMods:1.12-2.3.12-965") { exclude group: 'mezz.jei' } deobfCompile("de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r136") { diff --git a/libs/extrautils2-1.12-1.7.3.jar b/libs/extrautils2-1.12-1.7.3.jar deleted file mode 100644 index a6b2f66..0000000 Binary files a/libs/extrautils2-1.12-1.7.3.jar and /dev/null differ diff --git a/libs/extrautils2-1.12-1.9.2.jar b/libs/extrautils2-1.12-1.9.2.jar new file mode 100644 index 0000000..245fd2d Binary files /dev/null and b/libs/extrautils2-1.12-1.9.2.jar differ diff --git a/src/main/java/com/blamejared/ModTweaker.java b/src/main/java/com/blamejared/ModTweaker.java index f203af6..555cf8a 100644 --- a/src/main/java/com/blamejared/ModTweaker.java +++ b/src/main/java/com/blamejared/ModTweaker.java @@ -8,7 +8,6 @@ import com.blamejared.compat.thaumcraft.handlers.ThaumCraft; import crafttweaker.*; import net.minecraftforge.fml.common.*; import net.minecraftforge.fml.common.event.*; -import thaumcraft.Thaumcraft; import java.util.*; diff --git a/src/main/java/com/blamejared/compat/extrautils2/Resonator.java b/src/main/java/com/blamejared/compat/extrautils2/Resonator.java index f4c8b45..67059f0 100644 --- a/src/main/java/com/blamejared/compat/extrautils2/Resonator.java +++ b/src/main/java/com/blamejared/compat/extrautils2/Resonator.java @@ -5,6 +5,7 @@ import com.blamejared.mtlib.helpers.InputHelper; import com.blamejared.mtlib.helpers.LogHelper; import com.blamejared.mtlib.helpers.StackHelper; import com.blamejared.mtlib.utils.BaseAction; +import com.rwtema.extrautils2.crafting.ResonatorRecipe; import com.rwtema.extrautils2.tile.TileResonator; import crafttweaker.annotations.ModOnly; import crafttweaker.annotations.ZenRegister; @@ -14,6 +15,8 @@ import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import java.util.*; + @ZenClass("mods.extrautils2.Resonator") @ModOnly("extrautils2") @ZenRegister @@ -73,7 +76,13 @@ public class Resonator { @Override public void apply() { - TileResonator.resonatorRecipes.removeIf(resonatorRecipe -> StackHelper.matches(output, InputHelper.toIItemStack(resonatorRecipe.output))); + List list = new ArrayList<>(); + for(ResonatorRecipe recipe : TileResonator.resonatorRecipes) { + if(StackHelper.matches(output, InputHelper.toIItemStack(recipe.output))){ + list.add(recipe); + } + } + TileResonator.resonatorRecipes.removeAll(list); } @Override