updated mods, fixed EXU2 fix #683

This commit is contained in:
Jared 2018-09-12 19:35:46 +02:00
parent 720eaf0391
commit 9521e3d631
5 changed files with 13 additions and 5 deletions

View file

@ -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") {

Binary file not shown.

Binary file not shown.

View file

@ -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.*;

View file

@ -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<ResonatorRecipe> list = new ArrayList<>();
for(ResonatorRecipe recipe : TileResonator.resonatorRecipes) {
if(StackHelper.matches(output, InputHelper.toIItemStack(recipe.output))){
list.add(recipe);
}
}
TileResonator.resonatorRecipes.removeAll(list);
}
@Override