[ci skip] spotlessApply with the new settings

This commit is contained in:
Jason Mitchell committed 2023-01-28 17:43:10 -08:00
1 parent ab0b8f11d4
commit 69a5c0e6ee
221 files changed
+3125 -2632

No files matched your search

@@ -1,12 +1,5 @@
package com.glodblock.github.crossmod.opencomputers;
import appeng.api.parts.IPartHost;
import com.glodblock.github.common.parts.PartFluidInterface;
import com.glodblock.github.common.tile.TileFluidInterface;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.DualityFluidInterface;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import li.cil.oc.api.driver.EnvironmentProvider;
import li.cil.oc.api.driver.NamedBlock;
import li.cil.oc.api.driver.SidedBlock;
@@ -18,12 +11,22 @@ import li.cil.oc.api.network.ManagedEnvironment;
import li.cil.oc.api.network.Node;
import li.cil.oc.integration.ManagedTileEntityEnvironment;
import li.cil.oc.server.network.Component;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import appeng.api.parts.IPartHost;
import com.glodblock.github.common.parts.PartFluidInterface;
import com.glodblock.github.common.tile.TileFluidInterface;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.DualityFluidInterface;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
public class DriverDualFluidInterface implements SidedBlock {
@Override
@@ -45,20 +48,18 @@ public class DriverDualFluidInterface implements SidedBlock {
}
@Callback(
doc =
"function(index:number):table -- Get the configuration of the dual fluid interface on the specified slot.")
doc = "function(index:number):table -- Get the configuration of the dual fluid interface on the specified slot.")
public Object[] getFluidInterfaceConfiguration(Context context, Arguments args) {
int index = args.checkInteger(0);
if (index >= 0 && index < DualityFluidInterface.NUMBER_OF_TANKS) {
FluidStack fluid = tileEntity.getConfig().getFluidStackInSlot(index);
return new Object[] {fluid == null ? null : new FluidStack(fluid.getFluid(), 1000)};
return new Object[] { fluid == null ? null : new FluidStack(fluid.getFluid(), 1000) };
}
throw new IllegalArgumentException("invalid slot");
}
@Callback(
doc =
"function(index:number[, database:address, entry:number]):boolean -- Configure the filter in fluid interface on the specified slot.")
doc = "function(index:number[, database:address, entry:number]):boolean -- Configure the filter in fluid interface on the specified slot.")
public Object[] setFluidInterfaceConfiguration(Context context, Arguments args) {
int index = args.checkInteger(0);
String address;
@@ -69,7 +70,7 @@ public class DriverDualFluidInterface implements SidedBlock {
} else {
tileEntity.getConfig().setFluidInSlot(index, null);
context.pause(0.5);
return new Object[] {true};
return new Object[] { true };
}
Node node = node().network().node(address);
if (!(node instanceof Component)) throw new IllegalArgumentException("no such component");
@@ -84,7 +85,7 @@ public class DriverDualFluidInterface implements SidedBlock {
tileEntity.getConfig().setFluidInSlot(index, tileEntity.getStandardFluid(fluid));
}
context.pause(0.5);
return new Object[] {true};
return new Object[] { true };
}
throw new IllegalArgumentException("invalid slot");
}
@@ -125,13 +126,13 @@ public class DriverDualFluidInterface implements SidedBlock {
}
public static class Provider implements EnvironmentProvider {
Provider() {}
@Override
public Class<?> getEnvironment(ItemStack itemStack) {
if (itemStack != null
&& (itemStack.isItemEqual(ItemAndBlockHolder.FLUID_INTERFACE.stack())
|| itemStack.isItemEqual(ItemAndBlockHolder.INTERFACE.stack()))) {
if (itemStack != null && (itemStack.isItemEqual(ItemAndBlockHolder.FLUID_INTERFACE.stack())
|| itemStack.isItemEqual(ItemAndBlockHolder.INTERFACE.stack()))) {
return DriverDualFluidInterface.Environment.class;
}
return null;
@@ -1,14 +1,8 @@
package com.glodblock.github.crossmod.opencomputers;
import appeng.util.item.AEItemStack;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.tile.TileLevelMaintainer;
import com.glodblock.github.inventory.AeItemStackHandler;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.NameConst;
import cpw.mods.fml.common.registry.GameRegistry;
import java.util.HashMap;
import java.util.Map;
import li.cil.oc.api.driver.EnvironmentProvider;
import li.cil.oc.api.driver.NamedBlock;
import li.cil.oc.api.internal.Database;
@@ -20,12 +14,23 @@ import li.cil.oc.api.network.ManagedEnvironment;
import li.cil.oc.api.network.Node;
import li.cil.oc.api.prefab.DriverSidedTileEntity;
import li.cil.oc.integration.ManagedTileEntityEnvironment;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.util.item.AEItemStack;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.tile.TileLevelMaintainer;
import com.glodblock.github.inventory.AeItemStackHandler;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.NameConst;
import cpw.mods.fml.common.registry.GameRegistry;
public class DriverLevelMaintainer extends DriverSidedTileEntity {
@Override
public Class<?> getTileEntityClass() {
return TileLevelMaintainer.class;
@@ -100,18 +105,16 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
result.put("hasTag", stack.hasTagCompound());
result.put("label", stack.getDisplayName());
result.put("maxDamage", stack.getMaxDamage());
result.put(
"name",
GameRegistry.findUniqueIdentifierFor(stack.getItem()).toString());
result.put("name", GameRegistry.findUniqueIdentifierFor(stack.getItem()).toString());
result.put("quantity", tileEntity.requests.getQuantity(slot));
result.put("batch", tileEntity.requests.getBatchSize(slot));
result.put("isFluid", ItemFluidDrop.isFluidStack(stack));
if (ItemFluidDrop.isFluidStack(stack)) result.put("fluid", ItemFluidDrop.getFluidStack(stack));
result.put("isEnable", tileEntity.requests.isEnable(slot));
result.put("isDone", tileEntity.requests.isDone(slot));
return new Object[] {result};
return new Object[] { result };
}
return new Object[] {null};
return new Object[] { null };
}
private void setSlot(int slot, String address, int index) {
@@ -123,8 +126,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
throw new IllegalArgumentException("Invalid slot");
}
dbStack.stackSize = 1;
((AeItemStackHandler) tileEntity.getInventory())
.getAeInventory()
((AeItemStackHandler) tileEntity.getInventory()).getAeInventory()
.setStack(slot, AEItemStack.create(dbStack));
} else {
throw new IllegalArgumentException("Not a database");
@@ -135,8 +137,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
}
@Callback(
doc =
"function(slot:number[,database:address[,index:number]],quantity:number,batch:number):boolean -- Configuration the slot.")
doc = "function(slot:number[,database:address[,index:number]],quantity:number,batch:number):boolean -- Configuration the slot.")
public Object[] setSlot(Context context, Arguments args) {
int slot;
String address;
@@ -162,7 +163,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
} else {
throw new IllegalArgumentException("Invalid args");
}
return new Object[] {true};
return new Object[] { true };
}
private boolean isActive() {
@@ -171,22 +172,22 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
@Callback(doc = "function(slot:number):boolean -- Get the crafting task state.")
public Object[] isDone(Context context, Arguments args) {
return new Object[] {this.isDone(args)};
return new Object[] { this.isDone(args) };
}
@Callback(doc = "function(slot:number):boolean -- Get the crafting state of slot.")
public Object[] isEnable(Context context, Arguments args) {
return new Object[] {this.isEnable(args)};
return new Object[] { this.isEnable(args) };
}
@Callback(doc = "function(slot:number,value:boolean):boolean -- Set the crafting state of slot.")
public Object[] setEnable(Context context, Arguments args) {
return new Object[] {this.setEnable(args)};
return new Object[] { this.setEnable(args) };
}
@Callback(doc = "function():boolean Get Level Maintainer state")
public Object[] active(Context context, Arguments args) {
return new Object[] {this.isActive()};
return new Object[] { this.isActive() };
}
@Override
@@ -201,6 +202,7 @@ public class DriverLevelMaintainer extends DriverSidedTileEntity {
}
public static class Provider implements EnvironmentProvider {
Provider() {}
@Override
@@ -1,13 +1,5 @@
package com.glodblock.github.crossmod.opencomputers;
import appeng.items.misc.ItemEncodedPattern;
import appeng.util.item.AEItemStack;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.item.ItemFluidEncodedPattern;
import com.glodblock.github.common.tile.TileOCPatternEditor;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import li.cil.oc.api.driver.EnvironmentProvider;
import li.cil.oc.api.driver.NamedBlock;
import li.cil.oc.api.internal.Database;
@@ -19,6 +11,7 @@ import li.cil.oc.api.network.ManagedEnvironment;
import li.cil.oc.api.network.Node;
import li.cil.oc.api.prefab.DriverSidedTileEntity;
import li.cil.oc.integration.ManagedTileEntityEnvironment;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -27,6 +20,16 @@ import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import appeng.items.misc.ItemEncodedPattern;
import appeng.util.item.AEItemStack;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.common.item.ItemFluidEncodedPattern;
import com.glodblock.github.common.tile.TileOCPatternEditor;
import com.glodblock.github.loader.ItemAndBlockHolder;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
public class DriverOCPatternEditor extends DriverSidedTileEntity {
public DriverOCPatternEditor() {}
@@ -134,7 +137,7 @@ public class DriverOCPatternEditor extends DriverSidedTileEntity {
inv.setInventorySlotContents(slot, null);
inv.setInventorySlotContents(slot, pattern);
context.pause(0.1);
return new Object[] {true};
return new Object[] { true };
} else {
throw new IllegalArgumentException("Not Fluid Encoded pattern!");
}
@@ -170,7 +173,7 @@ public class DriverOCPatternEditor extends DriverSidedTileEntity {
inv.setInventorySlotContents(slot, null);
inv.setInventorySlotContents(slot, pattern);
context.pause(0.1);
return new Object[] {true};
return new Object[] { true };
} else {
throw new IllegalArgumentException("Not Fluid Encoded pattern!");
}
@@ -184,18 +187,17 @@ public class DriverOCPatternEditor extends DriverSidedTileEntity {
if (!validPattern(stack)) {
throw new IllegalArgumentException("Not Fluid Encoded pattern!");
}
return new Object[] {stack};
return new Object[] { stack };
}
@Callback(
doc =
"function([slot:number][, database:address, entry:number[, size:number]]):boolean -- Configure the interface.")
doc = "function([slot:number][, database:address, entry:number[, size:number]]):boolean -- Configure the interface.")
public Object[] setInterfaceConfiguration(Context context, Arguments args) {
IInventory config = tileEntity.getInternalInventory();
int slot = args.isString(0) ? 0 : optSlot(args, config, 0, 0);
config.setInventorySlotContents(slot, getStack(args));
context.pause(0.5);
return new Object[] {true};
return new Object[] { true };
}
@Callback(doc = "function([slot:number]):table -- Get the given pattern in the interface.")
@@ -203,33 +205,29 @@ public class DriverOCPatternEditor extends DriverSidedTileEntity {
IInventory inv = tileEntity.getInternalInventory();
int slot = optSlot(args, inv, 0, 0);
ItemStack stack = inv.getStackInSlot(slot);
return new Object[] {stack};
return new Object[] { stack };
}
@Callback(
doc =
"function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern item input at the given index.")
doc = "function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern item input at the given index.")
public Object[] setInterfacePatternItemInput(Context context, Arguments args) {
return setPatternSlot(context, args, "in", false);
}
@Callback(
doc =
"function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern item output at the given index.")
doc = "function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern item output at the given index.")
public Object[] setInterfacePatternItemOutput(Context context, Arguments args) {
return setPatternSlot(context, args, "out", false);
}
@Callback(
doc =
"function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern fluid input at the given index.")
doc = "function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern fluid input at the given index.")
public Object[] setInterfacePatternFluidInput(Context context, Arguments args) {
return setPatternSlot(context, args, "in", true);
}
@Callback(
doc =
"function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern fluid output at the given index.")
doc = "function(slot:number, database:address, entry:number, size:number, index:number):boolean -- Set the pattern fluid output at the given index.")
public Object[] setInterfacePatternFluidOutput(Context context, Arguments args) {
return setPatternSlot(context, args, "out", true);
}
@@ -256,6 +254,7 @@ public class DriverOCPatternEditor extends DriverSidedTileEntity {
}
public static class Provider implements EnvironmentProvider {
Provider() {}
@Override
@@ -1,24 +1,28 @@
package com.glodblock.github.crossmod.waila;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.util.Util;
import java.util.List;
import mcp.mobius.waila.handlers.nei.TooltipHandlerWaila;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.common.item.ItemFluidDrop;
import com.glodblock.github.util.Util;
public class FCTooltipHandlerWaila extends TooltipHandlerWaila {
@Override
public List<String> handleItemDisplayName(GuiContainer arg0, ItemStack itemstack, List<String> currenttip) {
return currenttip;
}
@Override
public List<String> handleItemTooltip(
GuiContainer arg0, ItemStack itemstack, int arg2, int arg3, List<String> currenttip) {
public List<String> handleItemTooltip(GuiContainer arg0, ItemStack itemstack, int arg2, int arg3,
List<String> currenttip) {
if (itemstack != null && itemstack.getItem() instanceof ItemFluidDrop && currenttip.size() > 0) {
FluidStack fs = ItemFluidDrop.getFluidStack(itemstack);
if (fs == null) return currenttip;
@@ -27,10 +31,7 @@ public class FCTooltipHandlerWaila extends TooltipHandlerWaila {
currenttip.set(
1,
EnumChatFormatting.GRAY
+ String.format(
"%s:%s",
Util.getFluidModID(fs.getFluid()),
fs.getFluid().getName())
+ String.format("%s:%s", Util.getFluidModID(fs.getFluid()), fs.getFluid().getName())
+ EnumChatFormatting.RESET);
}
String modName = Util.getFluidModName(fs.getFluid());
@@ -1,18 +1,11 @@
package com.glodblock.github.crossmod.waila;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.IPartWailaDataProvider;
import appeng.integration.modules.waila.part.PartAccessor;
import appeng.integration.modules.waila.part.Tracer;
import com.glodblock.github.crossmod.waila.part.FluidInvWailaDataProvider;
import com.glodblock.github.crossmod.waila.part.FluidMonitorWailaDataProvider;
import com.glodblock.github.crossmod.waila.part.SpeedWailaDataProvider;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -20,7 +13,19 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.IPartWailaDataProvider;
import appeng.integration.modules.waila.part.PartAccessor;
import appeng.integration.modules.waila.part.Tracer;
import com.glodblock.github.crossmod.waila.part.FluidInvWailaDataProvider;
import com.glodblock.github.crossmod.waila.part.FluidMonitorWailaDataProvider;
import com.glodblock.github.crossmod.waila.part.SpeedWailaDataProvider;
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
public class PartWailaDataProvider implements IWailaDataProvider {
private final List<IPartWailaDataProvider> providers;
private final PartAccessor accessor = new PartAccessor();
private final Tracer tracer = new Tracer();
@@ -55,11 +60,8 @@ public class PartWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaHead(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaHead(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
final TileEntity te = accessor.getTileEntity();
final MovingObjectPosition mop = accessor.getPosition();
@@ -77,11 +79,8 @@ public class PartWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaBody(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
final TileEntity te = accessor.getTileEntity();
final MovingObjectPosition mop = accessor.getPosition();
@@ -99,11 +98,8 @@ public class PartWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaTail(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaTail(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
final TileEntity te = accessor.getTileEntity();
final MovingObjectPosition mop = accessor.getPosition();
@@ -121,14 +117,8 @@ public class PartWailaDataProvider implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag,
final World world, final int x, final int y, final int z) {
final MovingObjectPosition mop = this.tracer.retraceBlock(world, player, x, y, z);
if (mop != null) {
@@ -1,19 +1,23 @@
package com.glodblock.github.crossmod.waila;
import com.glodblock.github.crossmod.waila.tile.FluidInvWailaDataProvider;
import com.glodblock.github.crossmod.waila.tile.LevelMaintainerWailaDataProvide;
import com.google.common.collect.Lists;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import com.glodblock.github.crossmod.waila.tile.FluidInvWailaDataProvider;
import com.glodblock.github.crossmod.waila.tile.LevelMaintainerWailaDataProvide;
import com.google.common.collect.Lists;
public class TileWailaDataProvider implements IWailaDataProvider {
private final List<IWailaDataProvider> providers;
public TileWailaDataProvider() {
@@ -28,11 +32,8 @@ public class TileWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaHead(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaHead(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
for (final IWailaDataProvider provider : this.providers) {
provider.getWailaHead(itemStack, currentToolTip, accessor, config);
}
@@ -41,11 +42,8 @@ public class TileWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaBody(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
for (final IWailaDataProvider provider : this.providers) {
provider.getWailaBody(itemStack, currentToolTip, accessor, config);
}
@@ -54,11 +52,8 @@ public class TileWailaDataProvider implements IWailaDataProvider {
}
@Override
public List<String> getWailaTail(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaTail(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
for (final IWailaDataProvider provider : this.providers) {
provider.getWailaTail(itemStack, currentToolTip, accessor, config);
}
@@ -67,14 +62,8 @@ public class TileWailaDataProvider implements IWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag,
final World world, final int x, final int y, final int z) {
for (final IWailaDataProvider provider : this.providers) {
provider.getNBTData(player, te, tag, world, x, y, z);
}
@@ -1,21 +1,23 @@
package com.glodblock.github.crossmod.waila;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import java.text.NumberFormat;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import net.minecraftforge.fluids.FluidStack;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
public class Tooltip {
public static String fluidFormat(String name, long amount) {
return String.format("%s: %s mB", name, NumberFormat.getInstance().format(amount));
}
public static String partFluidBusFormat(int amount) {
return String.format(
"%s: %s mB/t",
I18n.format(NameConst.WAILA_SPEED), NumberFormat.getInstance().format(amount));
return String
.format("%s: %s mB/t", I18n.format(NameConst.WAILA_SPEED), NumberFormat.getInstance().format(amount));
}
public static String tileFluidInterfaceFormat(String name, int amount, int face) {
@@ -1,12 +1,12 @@
package com.glodblock.github.crossmod.waila;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
import appeng.api.parts.IPartHost;
import appeng.tile.AEBaseTile;
import appeng.util.Platform;
import codechicken.nei.guihook.GuiContainerManager;
import cpw.mods.fml.common.event.FMLInterModComms;
import mcp.mobius.waila.api.IWailaDataProvider;
import mcp.mobius.waila.api.IWailaRegistrar;
public class WailaInit {
@@ -1,26 +1,28 @@
package com.glodblock.github.crossmod.waila.part;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.inventory.AEFluidInventory;
import com.glodblock.github.inventory.IAEFluidInventory;
public class FluidInvWailaDataProvider extends BasePartWailaDataProvider {
@Override
public List<String> getWailaBody(
final IPart part,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
if (part instanceof IAEFluidInventory) {
((IAEFluidInventory) part).getInternalFluid().readFromNBT(accessor.getNBTData(), "fluidInv");
AEFluidInventory fluidInventory = ((IAEFluidInventory) part).getInternalFluid();
@@ -34,15 +36,8 @@ public class FluidInvWailaDataProvider extends BasePartWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final IPart part,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
if (part instanceof IAEFluidInventory) {
((IAEFluidInventory) part).getInternalFluid().writeToNBT(tag, "fluidInv");
}
@@ -1,48 +1,41 @@
package com.glodblock.github.crossmod.waila.part;
import appeng.api.parts.IPart;
import appeng.api.storage.data.IAEFluidStack;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.common.parts.base.FCPartMonitor;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.util.Util;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import appeng.api.parts.IPart;
import appeng.api.storage.data.IAEFluidStack;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.common.parts.base.FCPartMonitor;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.util.Util;
public class FluidMonitorWailaDataProvider extends BasePartWailaDataProvider {
private final String key = "fluidStore";
@Override
public List<String> getWailaBody(
final IPart part,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
if (part instanceof FCPartMonitor && accessor.getNBTData().hasKey(key)) {
IAEFluidStack iaeFluidStack =
Util.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag(key));
if (iaeFluidStack != null)
currentToolTip.add(
Tooltip.fluidFormat(iaeFluidStack.getFluid().getLocalizedName(), iaeFluidStack.getStackSize()));
IAEFluidStack iaeFluidStack = Util.loadFluidStackFromNBT(accessor.getNBTData().getCompoundTag(key));
if (iaeFluidStack != null) currentToolTip.add(
Tooltip.fluidFormat(iaeFluidStack.getFluid().getLocalizedName(), iaeFluidStack.getStackSize()));
}
return currentToolTip;
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final IPart part,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
if (part instanceof FCPartMonitor && ((FCPartMonitor) part).getAEStoreFluidStack() != null) {
NBTTagCompound data = new NBTTagCompound();
((FCPartMonitor) part).getAEStoreFluidStack().writeToNBT(data);
@@ -1,25 +1,26 @@
package com.glodblock.github.crossmod.waila.part;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.common.parts.base.FCSharedFluidBus;
import com.glodblock.github.crossmod.waila.Tooltip;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import appeng.api.parts.IPart;
import appeng.integration.modules.waila.part.BasePartWailaDataProvider;
import com.glodblock.github.common.parts.base.FCSharedFluidBus;
import com.glodblock.github.crossmod.waila.Tooltip;
public class SpeedWailaDataProvider extends BasePartWailaDataProvider {
@Override
public List<String> getWailaBody(
final IPart part,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final IPart part, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
if (part instanceof FCSharedFluidBus) {
part.readFromNBT(accessor.getNBTData());
currentToolTip.add(Tooltip.partFluidBusFormat(((FCSharedFluidBus) part).calculateAmountToSend() / 5));
@@ -28,15 +29,8 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final IPart part,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te,
final NBTTagCompound tag, final World world, final int x, final int y, final int z) {
if (part instanceof FCSharedFluidBus) {
part.writeToNBT(tag);
}
@@ -1,16 +1,10 @@
package com.glodblock.github.crossmod.waila.tile;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.common.tile.TileFluidBuffer;
import com.glodblock.github.common.tile.TileFluidInterface;
import com.glodblock.github.common.tile.TileFluidPacketDecoder;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -19,14 +13,21 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import com.glodblock.github.common.item.ItemFluidPacket;
import com.glodblock.github.common.tile.TileFluidBuffer;
import com.glodblock.github.common.tile.TileFluidInterface;
import com.glodblock.github.common.tile.TileFluidPacketDecoder;
import com.glodblock.github.crossmod.waila.Tooltip;
import com.glodblock.github.inventory.IAEFluidInventory;
import com.glodblock.github.inventory.IAEFluidTank;
public class FluidInvWailaDataProvider extends BaseWailaDataProvider {
@Override
public List<String> getWailaBody(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
final TileEntity te = accessor.getTileEntity();
if (te instanceof TileFluidInterface) {
((IAEFluidInventory) te).getInternalFluid().readFromNBT(accessor.getNBTData(), "fluidInv");
@@ -53,8 +54,7 @@ public class FluidInvWailaDataProvider extends BaseWailaDataProvider {
if (ft.getFluidInSlot(i) == null) continue;
FluidStack fs = ft.getFluidInSlot(i).getFluidStack();
if (prefix) {
currentToolTip.add(
Tooltip.tileFluidInterfaceFormat(fs.getFluid().getLocalizedName(), fs.amount, i));
currentToolTip.add(Tooltip.tileFluidInterfaceFormat(fs.getFluid().getLocalizedName(), fs.amount, i));
} else {
currentToolTip.add(Tooltip.fluidFormat(fs.getFluid().getLocalizedName(), fs.amount));
}
@@ -66,14 +66,8 @@ public class FluidInvWailaDataProvider extends BaseWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag,
final World world, final int x, final int y, final int z) {
if (te instanceof TileFluidBuffer) {
((TileFluidBuffer) te).updateFluidStore();
}
@@ -1,37 +1,39 @@
package com.glodblock.github.crossmod.waila.tile;
import appeng.api.storage.data.IAEItemStack;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import com.glodblock.github.common.tile.TileLevelMaintainer;
import com.glodblock.github.crossmod.waila.Tooltip;
import java.util.List;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import appeng.api.storage.data.IAEItemStack;
import appeng.integration.modules.waila.BaseWailaDataProvider;
import com.glodblock.github.common.tile.TileLevelMaintainer;
import com.glodblock.github.crossmod.waila.Tooltip;
public class LevelMaintainerWailaDataProvide extends BaseWailaDataProvider {
@Override
public List<String> getWailaBody(
final ItemStack itemStack,
final List<String> currentToolTip,
final IWailaDataAccessor accessor,
final IWailaConfigHandler config) {
public List<String> getWailaBody(final ItemStack itemStack, final List<String> currentToolTip,
final IWailaDataAccessor accessor, final IWailaConfigHandler config) {
final TileEntity te = accessor.getTileEntity();
if (te instanceof TileLevelMaintainer) {
te.readFromNBT(accessor.getNBTData());
for (int i = 0; i < TileLevelMaintainer.REQ_COUNT; i++) {
IAEItemStack ias =
((TileLevelMaintainer) te).requests.getRequestStacks().getStack(i);
IAEItemStack ias = ((TileLevelMaintainer) te).requests.getRequestStacks().getStack(i);
if (ias != null) {
currentToolTip.add(Tooltip.tileLevelMaintainerFormat(
ias.getItemStack().getDisplayName(),
((TileLevelMaintainer) te).requests.getQuantity(i),
((TileLevelMaintainer) te).requests.getBatchSize(i),
((TileLevelMaintainer) te).requests.isEnable(i)));
currentToolTip.add(
Tooltip.tileLevelMaintainerFormat(
ias.getItemStack().getDisplayName(),
((TileLevelMaintainer) te).requests.getQuantity(i),
((TileLevelMaintainer) te).requests.getBatchSize(i),
((TileLevelMaintainer) te).requests.isEnable(i)));
}
}
}
@@ -39,14 +41,8 @@ public class LevelMaintainerWailaDataProvide extends BaseWailaDataProvider {
}
@Override
public NBTTagCompound getNBTData(
final EntityPlayerMP player,
final TileEntity te,
final NBTTagCompound tag,
final World world,
final int x,
final int y,
final int z) {
public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag,
final World world, final int x, final int y, final int z) {
if (te instanceof TileLevelMaintainer) {
te.writeToNBT(tag);
}