diff --git a/libs/ae2fc-1.1.73-gtnh-dev.jar b/libs/ae2fc-1.1.73-gtnh-dev.jar new file mode 100644 index 0000000..ceac339 Binary files /dev/null and b/libs/ae2fc-1.1.73-gtnh-dev.jar differ diff --git a/libs/gregtech-1.7.10-5.09.34.74-dev.jar b/libs/gregtech-1.7.10-5.09.34.76-8-g7f356d4.dirty-dev.jar similarity index 87% rename from libs/gregtech-1.7.10-5.09.34.74-dev.jar rename to libs/gregtech-1.7.10-5.09.34.76-8-g7f356d4.dirty-dev.jar index 99b4e12..bfa41ce 100644 Binary files a/libs/gregtech-1.7.10-5.09.34.74-dev.jar and b/libs/gregtech-1.7.10-5.09.34.76-8-g7f356d4.dirty-dev.jar differ diff --git a/repositories.gradle b/repositories.gradle index bcb2d05..4d3d713 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -3,7 +3,7 @@ repositories { maven { name = "ic2" - url = "https://maven.ic2.player.to/" + url = "https://maven2.ic2.player.to/" metadataSources { mavenPom() artifact() diff --git a/src/main/java/space/gtimpact/mixinmodule/mixinplugin/Mixin.java b/src/main/java/space/gtimpact/mixinmodule/mixinplugin/Mixin.java index bc8656a..032c220 100644 --- a/src/main/java/space/gtimpact/mixinmodule/mixinplugin/Mixin.java +++ b/src/main/java/space/gtimpact/mixinmodule/mixinplugin/Mixin.java @@ -32,6 +32,7 @@ public enum Mixin { ItemIC2FluidContainer_Mixin("ic2.ItemIC2FluidContainer_Mixin", IC2), MovableTileRegistry_Mixin("ae2.MovableTileRegistry_Mixin", AE, GREGTECH, VANILLA), + AEFC_GT_Fix_Mixin("ae2.MovableTileRegistry_Mixin", AE2FC, AE, GREGTECH, VANILLA), ForgeHooksClient_Mixin("vanilla.ForgeHooksClient_Mixin", VANILLA), BlockHopper_Mixin("vanilla.BlockHopper_Mixin", VANILLA), diff --git a/src/main/java/space/gtimpact/mixinmodule/mixinplugin/TargetedMod.java b/src/main/java/space/gtimpact/mixinmodule/mixinplugin/TargetedMod.java index 95dd3b2..1ff8bec 100644 --- a/src/main/java/space/gtimpact/mixinmodule/mixinplugin/TargetedMod.java +++ b/src/main/java/space/gtimpact/mixinmodule/mixinplugin/TargetedMod.java @@ -17,6 +17,7 @@ public enum TargetedMod { GREGTECH("GregTech", "gregtech", true), IC2("IndustrialCraft 2", "industrialcraft", true), AE("Applied Energistics 2", "appliedenergistics2", true), + AE2FC("Fluid Craft For AE2", "ae2fc", true), COFH("CoFHCore", "CoFHCore", true), ; diff --git a/src/main/java/space/gtimpact/mixinmodule/mixins/ae2/AEFC_GT_Fix_Mixin.java b/src/main/java/space/gtimpact/mixinmodule/mixins/ae2/AEFC_GT_Fix_Mixin.java new file mode 100644 index 0000000..138486e --- /dev/null +++ b/src/main/java/space/gtimpact/mixinmodule/mixins/ae2/AEFC_GT_Fix_Mixin.java @@ -0,0 +1,27 @@ +package space.gtimpact.mixinmodule.mixins.ae2; + +import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaPipeEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(FluidConvertingInventoryAdaptor.class) +public class AEFC_GT_Fix_Mixin { + + @Inject(method = "checkGTPipeConnection", at = @At("HEAD"), remap = false, cancellable = true) + private void checkGTPipeConnection(TileEntity te, ForgeDirection direction, CallbackInfoReturnable cir) { + if (te instanceof IGregTechTileEntity) { + IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); + if (mte instanceof MetaPipeEntity) { + cir.setReturnValue(((MetaPipeEntity) mte).isConnectedAtSide(direction.ordinal())); + } + } + cir.setReturnValue(true); + } +}