Added waila support back

This commit is contained in:
Modmuss50 2015-12-13 19:41:46 +00:00
parent 67d2d9c863
commit abcaccdc82
4 changed files with 7 additions and 5 deletions

View file

@ -92,9 +92,9 @@ dependencies {
// compile "codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev" // compile "codechicken:CodeChickenCore:1.7.10-1.0.7.+:dev"
// compile "codechicken:NotEnoughItems:1.7.10-1.0.5.+:dev" // compile "codechicken:NotEnoughItems:1.7.10-1.0.5.+:dev"
// compile "codechicken:ForgeMultipart:1.7.10-1.2.0.345:dev" // compile "codechicken:ForgeMultipart:1.7.10-1.2.0.345:dev"
// deobfCompile ("mcp.mobius.waila:Waila:1.6.0_B1_1.8.1") { compile ("mcp.mobius.waila:Waila:1.6.0-B2_1.8.8:dev") {
// exclude group: 'mcp.mobius.waila' exclude group: 'mcp.mobius.waila'
// } }
// compile name: 'buildcraft', version: '7.1.13', classifier: "dev", ext: 'jar' // compile name: 'buildcraft', version: '7.1.13', classifier: "dev", ext: 'jar'
// compile "qmunity:QmunityLib:0.2.+:deobf" // compile "qmunity:QmunityLib:0.2.+:deobf"
// compile "com.pahimar.ee3:EquivalentExchange3:1.7.10-0.3.507:dev" // compile "com.pahimar.ee3:EquivalentExchange3:1.7.10-0.3.507:dev"

View file

@ -2,6 +2,7 @@ package techreborn.compat;
import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Loader;
import techreborn.compat.jei.JEIPlugin; import techreborn.compat.jei.JEIPlugin;
import techreborn.compat.waila.CompatModuleWaila;
import java.util.ArrayList; import java.util.ArrayList;
@ -29,7 +30,7 @@ public class CompatManager {
isGregTechLoaded = true; isGregTechLoaded = true;
} }
registerCompact(JEIPlugin.class, "JEI"); registerCompact(JEIPlugin.class, "JEI");
registerCompact(CompatModuleWaila.class, "Waila");
} }
public void registerCompact(Class<?> moduleClass, Object... objs) { public void registerCompact(Class<?> moduleClass, Object... objs) {

View file

@ -7,6 +7,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import techreborn.tiles.TileMachineBase; import techreborn.tiles.TileMachineBase;
@ -53,7 +54,7 @@ public class WailaProviderMachines implements IWailaDataProvider {
@Override @Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te,
NBTTagCompound tag, World w, int x, int y, int z) { NBTTagCompound tag, World w, BlockPos pos) {
return tag; return tag;
} }