diff --git a/libs/Waila-1.9-GigaBuild.jar b/libs/Waila-1.9-GigaBuild.jar new file mode 100644 index 000000000..150e383ea Binary files /dev/null and b/libs/Waila-1.9-GigaBuild.jar differ diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 3ea809728..1edbc0bd2 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -8,6 +8,7 @@ import techreborn.compat.waila.CompatModuleWaila; import techreborn.config.ConfigTechReborn; import techreborn.parts.StandalonePartCompact; import techreborn.parts.TechRebornParts; +import techreborn.parts.walia.WailaMcMultiPartCompact; import java.util.ArrayList; @@ -42,7 +43,7 @@ public class CompatManager { registerCompact(TechRebornParts.class, "mcmultipart"); registerCompact(ClientPartLoader.class, "mcmultipart", "@client"); registerCompact(StandalonePartCompact.class, "!mcmultipart"); - //registerCompact(WailaMcMultiPartCompact.class, "mcmultipart", "Waila"); + registerCompact(WailaMcMultiPartCompact.class, "mcmultipart", "Waila"); } public void registerCompact(Class moduleClass, Object... objs) { diff --git a/ToAddBack/1.9/walia/IPartWaliaProvider.java b/src/main/java/techreborn/parts/walia/IPartWaliaProvider.java similarity index 100% rename from ToAddBack/1.9/walia/IPartWaliaProvider.java rename to src/main/java/techreborn/parts/walia/IPartWaliaProvider.java diff --git a/ToAddBack/1.9/walia/WailaMcMultiPartCompact.java b/src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java similarity index 93% rename from ToAddBack/1.9/walia/WailaMcMultiPartCompact.java rename to src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java index 7cc83d01e..2bb01cb4a 100644 --- a/ToAddBack/1.9/walia/WailaMcMultiPartCompact.java +++ b/src/main/java/techreborn/parts/walia/WailaMcMultiPartCompact.java @@ -1,5 +1,6 @@ package techreborn.parts.walia; +import mcmultipart.block.TileMultipartContainer; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLInterModComms; @@ -34,6 +35,6 @@ public class WailaMcMultiPartCompact implements ICompatModule { } public static void callbackRegister(IWailaRegistrar registrar) { - registrar.registerBodyProvider(new WaliaPartProvider(), TileMultipart.class); + registrar.registerBodyProvider(new WaliaPartProvider(), TileMultipartContainer.class); } } diff --git a/ToAddBack/1.9/walia/WaliaPartProvider.java b/src/main/java/techreborn/parts/walia/WaliaPartProvider.java similarity index 100% rename from ToAddBack/1.9/walia/WaliaPartProvider.java rename to src/main/java/techreborn/parts/walia/WaliaPartProvider.java diff --git a/src/main/java/techreborn/power/TRPowerNet.java b/src/main/java/techreborn/power/TRPowerNet.java index db109d836..a1ff55f9d 100644 --- a/src/main/java/techreborn/power/TRPowerNet.java +++ b/src/main/java/techreborn/power/TRPowerNet.java @@ -274,7 +274,7 @@ public class TRPowerNet { public int getTotalInsertible() { int total = 0; - if (tile.canAcceptEnergy(side)) { + if (tile.canAcceptEnergy(side.getOpposite())) { total += tile.addEnergy(type.transferRate, true); }