Improve TOP support

This commit is contained in:
modmuss50 2017-10-12 17:50:03 +01:00
parent f5e73d23fa
commit 984e9eb2f2

View file

@ -25,18 +25,28 @@
package techreborn.compat.theoneprobe; package techreborn.compat.theoneprobe;
import mcjty.theoneprobe.api.*; import mcjty.theoneprobe.api.*;
import mcjty.theoneprobe.apiimpl.providers.ChestInfoTools;
import mcjty.theoneprobe.apiimpl.styles.ProgressStyle; import mcjty.theoneprobe.apiimpl.styles.ProgressStyle;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.api.IListInfoProvider; import reborncore.api.IListInfoProvider;
import reborncore.api.power.IEnergyInterfaceTile; import reborncore.api.power.IEnergyInterfaceTile;
import reborncore.common.RebornCoreConfig; import reborncore.common.RebornCoreConfig;
import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.tile.TileLegacyMachineBase;
import reborncore.common.util.Inventory;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* Created by Mark on 04/06/2016. * Created by Mark on 04/06/2016.
@ -45,9 +55,22 @@ public class ProbeProvider implements IProbeInfoProvider {
ProgressStyle euStyle = new ProgressStyle().backgroundColor(0xFF8B8B8B).borderColor(0xFF373737).alternateFilledColor(PowerSystem.getDisplayPower().altColour).filledColor(PowerSystem.getDisplayPower().colour); ProgressStyle euStyle = new ProgressStyle().backgroundColor(0xFF8B8B8B).borderColor(0xFF373737).alternateFilledColor(PowerSystem.getDisplayPower().altColour).filledColor(PowerSystem.getDisplayPower().colour);
MethodHandle methodHandle_addStacks;
public ProbeProvider() { public ProbeProvider() {
euStyle.suffix(" " + PowerSystem.getDisplayPower().abbreviation); euStyle.suffix(" " + PowerSystem.getDisplayPower().abbreviation);
euStyle.numberFormat(NumberFormat.COMMAS); euStyle.numberFormat(NumberFormat.COMMAS);
try {
//Can we just all agree to make things that might be useful to others public, thanks.
MethodHandles.Lookup lookup = MethodHandles.lookup();
Method pm = ChestInfoTools.class.getDeclaredMethod("showChestContents", IProbeInfo.class, World.class, BlockPos.class, List.class, boolean.class);
pm.setAccessible(true);
methodHandle_addStacks = lookup.unreflect(pm);
} catch (NoSuchMethodException | IllegalAccessException e) {
e.printStackTrace();
}
} }
@Override @Override
@ -75,5 +98,31 @@ public class ProbeProvider implements IProbeInfoProvider {
probeInfo.progress((int) energy.getEnergy(), (int) energy.getMaxPower(), euStyle); probeInfo.progress((int) energy.getEnergy(), (int) energy.getMaxPower(), euStyle);
} }
} }
if (tile instanceof TileLegacyMachineBase && methodHandle_addStacks != null) {
TileLegacyMachineBase legacyMachineBase = (TileLegacyMachineBase) tile;
if (legacyMachineBase.getInventoryForTile().isPresent()) {
if (player.isSneaking()) {
probeInfo.text("Inventory");
}
Inventory inventory = legacyMachineBase.getInventoryForTile().get();
List<ItemStack> stacks = Arrays.stream(inventory.contents).filter(stack -> !stack.isEmpty()).collect(Collectors.toList());
try {
methodHandle_addStacks.invoke(probeInfo, world, null, stacks, player.isSneaking());
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
if (!legacyMachineBase.upgradeInventory.isEmpty() && player.isSneaking()) {
probeInfo.horizontal();
probeInfo.text("Upgrades");
List<ItemStack> stacks = Arrays.stream(legacyMachineBase.upgradeInventory.contents).filter(stack -> !stack.isEmpty()).collect(Collectors.toList());
try {
methodHandle_addStacks.invoke(probeInfo, world, null, stacks, player.isSneaking());
} catch (Throwable throwable) {
throwable.printStackTrace();
}
}
}
} }
} }