Skip to content

Commit 193e90f

Browse files
committed
fix(compatibility): correct Optional.Interface stripping | fixes #42
Re-add IMjReceiver to ForgeReceiver - Strip interface if BC isn't loaded
1 parent 38f7db1 commit 193e90f

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/main/java/micdoodle8/mods/galacticraft/core/GalacticraftCore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
@Mod(modid = Constants.MOD_ID_CORE,
199199
name = GalacticraftCore.NAME,
200200
version = Constants.VERSION,
201-
dependencies = "required-after:forge@[14.23.5.2860,);",
201+
dependencies = "required-after:forge@[14.23.5.2847,);",
202202
useMetadata = true,
203203
acceptedMinecraftVersions = "[1.12, 1.13)",
204204
guiFactory = "micdoodle8.mods.galacticraft.core.client.gui.screen.ConfigGuiFactoryCore",

src/main/java/micdoodle8/mods/galacticraft/core/energy/tile/TileBaseUniversalElectrical.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package micdoodle8.mods.galacticraft.core.energy.tile;
22

33
import buildcraft.api.mj.IMjConnector;
4+
import buildcraft.api.mj.IMjReceiver;
45
import buildcraft.api.mj.MjAPI;
56
import ic2.api.energy.tile.IEnergyEmitter;
67
import ic2.api.energy.tile.IEnergyTile;
@@ -513,7 +514,8 @@ public <T> T getCapability(Capability<T> capability, EnumFacing facing)
513514
return super.getCapability(capability, facing);
514515
}
515516

516-
private static class ForgeReceiver implements net.minecraftforge.energy.IEnergyStorage
517+
@Optional.Interface(modid = "buildcraftenergy", iface = "buildcraft.api.mj.IMjReceiver")
518+
private static class ForgeReceiver implements net.minecraftforge.energy.IEnergyStorage, IMjReceiver
517519
{
518520

519521
private TileBaseUniversalElectrical tile;

src/main/java/micdoodle8/mods/galacticraft/core/energy/tile/TileBaseUniversalElectricalSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public boolean hasCapability(Capability<?> cap, EnumFacing side)
250250
@Override
251251
public <T> T getCapability(Capability<T> cap, EnumFacing side)
252252
{
253-
if (cap == CapabilityEnergy.ENERGY && this.canOutputEnergy(side))
253+
if (cap == CapabilityEnergy.ENERGY && this.getElectricalOutputDirections().contains(side))
254254
return (T) new ForgeEmitter(this);
255255
if (cap != null && (cap == EnergyUtil.mekCableOutput || cap == EnergyUtil.mekEnergyStorage))
256256
{

0 commit comments

Comments
 (0)