From ada9e706f3cf6f39abb0558105962b52a37f98a4 Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 30 Jan 2023 13:48:58 +0000 Subject: [PATCH] Fix compilation against CT's API --- dependencies.gradle | 2 +- .../java/modtweaker2/mods/mekanism/gas/MCGasStack.java | 6 ++++++ .../modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index bc0a447..44d83bc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - api("com.github.GTNewHorizons:CraftTweaker:3.2.10:dev") + api("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev") compileOnly("com.azanor:Thaumcraft:1.7.10-4.2.3.5:deobf") { transitive = false } compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-72-GTNH:dev") { transitive = false } diff --git a/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java index 6589a54..d668148 100644 --- a/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java @@ -107,6 +107,12 @@ public class MCGasStack implements IGasStack { return false; } + @Override + public boolean matchesExact(IItemStack item) { + // TODO Auto-generated method stub + return false; + } + @Override public boolean matches(ILiquidStack arg0) { // TODO Auto-generated method stub diff --git a/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java b/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java index a78f53b..5185f2e 100644 --- a/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/aspect/MCAspectStack.java @@ -99,7 +99,7 @@ public class MCAspectStack implements IAspectStack { if (internal != null) { AspectList itemAspectList = new AspectList(internal); - if (itemAspectList.aspects.keySet().contains(stack.aspect.getTag())) { + if (itemAspectList.aspects.containsKey(stack.aspect)) { return true; } } @@ -126,6 +126,11 @@ public class MCAspectStack implements IAspectStack { return false; } + @Override + public boolean matchesExact(IItemStack item) { + return matches(item); + } + @Override public IIngredient only(IItemCondition arg0) { // TODO Auto-generated method stub