Added more walia support, fix building

This commit is contained in:
modmuss50 2016-03-21 19:45:48 +00:00
parent 4f3d9ddfca
commit aa64b1a8d6
6 changed files with 5 additions and 3 deletions

View file

@ -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<? extends ICompatModule> moduleClass, Object... objs) {

View file

@ -0,0 +1,11 @@
package techreborn.parts.walia;
import java.util.List;
/**
* Created by modmuss50 on 07/03/2016.
*/
public interface IPartWaliaProvider {
void addInfo(List<String> info);
}

View file

@ -0,0 +1,40 @@
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;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import techreborn.compat.ICompatModule;
/**
* Created by modmuss50 on 07/03/2016.
*/
public class WailaMcMultiPartCompact implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
}
@Override
public void init(FMLInitializationEvent event) {
FMLInterModComms.sendMessage("Waila", "register", getClass().getName()
+ ".callbackRegister");
}
@Override
public void postInit(FMLPostInitializationEvent event) {
}
@Override
public void serverStarting(FMLServerStartingEvent event) {
}
public static void callbackRegister(IWailaRegistrar registrar) {
registrar.registerBodyProvider(new WaliaPartProvider(), TileMultipartContainer.class);
}
}

View file

@ -0,0 +1,77 @@
package techreborn.parts.walia;
import java.util.ArrayList;
import java.util.List;
import mcmultipart.raytrace.PartMOP;
import mcmultipart.raytrace.RayTraceUtils;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import techreborn.parts.CableMultipart;
/**
* Created by modmuss50 on 07/03/2016.
*/
public class WaliaPartProvider implements IWailaDataProvider {
@Override
public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
PartMOP mop = reTrace(accessor.getWorld(), accessor.getPosition(), accessor.getPlayer());
if (mop != null) {
if (mop.partHit instanceof CableMultipart) {
return mop.partHit.getDrops().get(0);
}
}
return null;
}
@Override
public List<String> getWailaHead(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
}
@Override
public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
PartMOP mop = reTrace(accessor.getWorld(), accessor.getPosition(), accessor.getPlayer());
List<String> data = new ArrayList<>();
if (mop != null) {
if (mop.partHit instanceof IPartWaliaProvider) {
((IPartWaliaProvider) mop.partHit).addInfo(data);
}
}
return data;
}
@Override
public List<String> getWailaTail(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
return null;
}
@Override
public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, BlockPos pos) {
return null;
}
//Stolen from https://github.com/amadornes/MCMultiPart/blob/master/src/main/java/mcmultipart/block/BlockMultipart.java
private PartMOP reTrace(World world, BlockPos pos, EntityPlayer player) {
Vec3d start = RayTraceUtils.getStart(player);
Vec3d end = RayTraceUtils.getEnd(player);
RayTraceUtils.RayTraceResultPart result = getMultipartTile(world, pos).getPartContainer().collisionRayTrace(start, end);
return result == null ? null : result.hit;
}
//Stolen from https://github.com/amadornes/MCMultiPart/blob/master/src/main/java/mcmultipart/block/BlockMultipart.java
private TileMultipart getMultipartTile(IBlockAccess world, BlockPos pos) {
TileEntity tile = world.getTileEntity(pos);
return tile instanceof TileMultipart ? (TileMultipart) tile : null;
}
}

View file

@ -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);
}