From 1ae643f0b9f299d55db1c765cd40838e3e042e7e Mon Sep 17 00:00:00 2001 From: Lex Date: Mon, 2 Nov 2020 14:08:40 +0700 Subject: [PATCH] Speed parts * 100 --- .../opencomputers/DriverFluidExportBus.java | 2 +- src/main/scala/extracells/part/PartFluidIO.java | 8 ++++---- src/main/scala/extracells/part/PartFluidImport.java | 2 +- .../scala/extracells/part/PartFluidInterface.java | 10 +++++----- .../tileentity/TileEntityFluidInterface.java | 12 ++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/scala/extracells/integration/opencomputers/DriverFluidExportBus.java b/src/main/scala/extracells/integration/opencomputers/DriverFluidExportBus.java index 2137e7a..5743871 100644 --- a/src/main/scala/extracells/integration/opencomputers/DriverFluidExportBus.java +++ b/src/main/scala/extracells/integration/opencomputers/DriverFluidExportBus.java @@ -159,7 +159,7 @@ public Object[] exportFluid(Context context, Arguments args){ return new Object[]{false, "no export bus"}; if (part.getFacingTank() == null) return new Object[]{false, "no tank"}; - int amount = Math.min(args.optInteger(1, 625), 125 + part.getSpeedState() * 125); + int amount = Math.min(args.optInteger(1, 62500), 12500 + part.getSpeedState() * 12500); boolean didSomething = part.doWork(amount, 1); if (didSomething) context.pause(0.25); diff --git a/src/main/scala/extracells/part/PartFluidIO.java b/src/main/scala/extracells/part/PartFluidIO.java index 36c3e58..3f58e29 100644 --- a/src/main/scala/extracells/part/PartFluidIO.java +++ b/src/main/scala/extracells/part/PartFluidIO.java @@ -140,15 +140,15 @@ public ECPrivateInventory getUpgradeInventory() { @Override public List getWailaBodey(NBTTagCompound tag, List oldList) { if (tag.hasKey("speed")) - oldList.add(tag.getInteger("speed") + "mB/t"); + oldList.add(tag.getInteger("speed") + "L/t"); else - oldList.add("125mB/t"); + oldList.add("12500 L/t"); return oldList; } @Override public NBTTagCompound getWailaTag(NBTTagCompound tag) { - tag.setInteger("speed", 125 + this.speedState * 125); + tag.setInteger("speed", 12500 + this.speedState * 12500); return tag; } @@ -261,7 +261,7 @@ public void setPartHostInfo(ForgeDirection _side, IPartHost _host, public final TickRateModulation tickingRequest(IGridNode node, int TicksSinceLastCall) { if (canDoWork()) - return doWork(125 + this.speedState * 125, TicksSinceLastCall) ? TickRateModulation.FASTER + return doWork(12500 + this.speedState * 12500, TicksSinceLastCall) ? TickRateModulation.FASTER : TickRateModulation.SLOWER; return TickRateModulation.SLOWER; } diff --git a/src/main/scala/extracells/part/PartFluidImport.java b/src/main/scala/extracells/part/PartFluidImport.java index ad6b24b..5b0685a 100644 --- a/src/main/scala/extracells/part/PartFluidImport.java +++ b/src/main/scala/extracells/part/PartFluidImport.java @@ -97,7 +97,7 @@ public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { boolean redstonePowered = isRedstonePowered(); if (resource == null || redstonePowered && getRedstoneMode() == RedstoneMode.LOW_SIGNAL || !redstonePowered && getRedstoneMode() == RedstoneMode.HIGH_SIGNAL) return 0; - int drainAmount = Math.min(125 + this.speedState * 125, resource.amount); + int drainAmount = Math.min(12500 + this.speedState * 12500, resource.amount); FluidStack toFill = new FluidStack(resource.getFluid(), drainAmount); Actionable action = doFill ? Actionable.MODULATE : Actionable.SIMULATE; IAEFluidStack filled = injectFluid(AEApi.instance().storage().createFluidStack(toFill), action); diff --git a/src/main/scala/extracells/part/PartFluidInterface.java b/src/main/scala/extracells/part/PartFluidInterface.java index 6a973bb..b91628e 100644 --- a/src/main/scala/extracells/part/PartFluidInterface.java +++ b/src/main/scala/extracells/part/PartFluidInterface.java @@ -207,7 +207,7 @@ public void writeToNBT(NBTTagCompound tagCompound) { private IAEItemStack toExport = null; private final Item encodedPattern = AEApi.instance().definitions().items().encodedPattern().maybeItem().orNull(); - private FluidTank tank = new FluidTank(10000) { + private FluidTank tank = new FluidTank(64000) { @Override public FluidTank readFromNBT(NBTTagCompound nbt) { if (!nbt.hasKey("Empty")) { @@ -442,14 +442,14 @@ public List getWailaBodey(NBTTagCompound tag, List list) { .translateToLocal("extracells.tooltip.empty1")); list.add(StatCollector .translateToLocal("extracells.tooltip.amount") - + ": 0mB / 10000mB"); + + ": 0L / 64000L"); } else { list.add(StatCollector.translateToLocal("extracells.tooltip.fluid") + ": " + fluid.getLocalizedName()); list.add(StatCollector .translateToLocal("extracells.tooltip.amount") + ": " - + fluid.amount + "mB / 10000mB"); + + fluid.amount + "L / 64000L"); } return list; } @@ -938,7 +938,7 @@ public TickRateModulation tickingRequest(IGridNode node, if (this.tank.getFluid() != null && FluidRegistry.getFluid(this.fluidFilter) != this.tank .getFluid().getFluid()) { - FluidStack s = this.tank.drain(125, false); + FluidStack s = this.tank.drain(12500, false); if (s != null) { IAEFluidStack notAdded = storage.getFluidInventory() .injectItems( @@ -975,7 +975,7 @@ public TickRateModulation tickingRequest(IGridNode node, .storage() .createFluidStack( new FluidStack(FluidRegistry - .getFluid(this.fluidFilter), 125)), + .getFluid(this.fluidFilter), 12500)), Actionable.SIMULATE, new MachineSource(this)); if (extracted == null) return TickRateModulation.URGENT; diff --git a/src/main/scala/extracells/tileentity/TileEntityFluidInterface.java b/src/main/scala/extracells/tileentity/TileEntityFluidInterface.java index d93fdee..9ca32e3 100644 --- a/src/main/scala/extracells/tileentity/TileEntityFluidInterface.java +++ b/src/main/scala/extracells/tileentity/TileEntityFluidInterface.java @@ -202,7 +202,7 @@ public TileEntityFluidInterface() { this.inventory = new FluidInterfaceInventory(); this.gridBlock = new ECFluidGridBlock(this); for (int i = 0; i < this.tanks.length; i++) { - this.tanks[i] = new FluidTank(10000) { + this.tanks[i] = new FluidTank(64000) { @Override public FluidTank readFromNBT(NBTTagCompound nbt) { if (!nbt.hasKey("Empty")) { @@ -424,7 +424,7 @@ public List getWailaBody(List list, NBTTagCompound tag, + side.ordinal())); FluidTank[] tanks = new FluidTank[6]; for (int i = 0; i < tanks.length; i++) { - tanks[i] = new FluidTank(10000) { + tanks[i] = new FluidTank(64000) { @Override public FluidTank readFromNBT(NBTTagCompound nbt) { if (!nbt.hasKey("Empty")) { @@ -452,14 +452,14 @@ public FluidTank readFromNBT(NBTTagCompound nbt) { .translateToLocal("extracells.tooltip.empty1")); list.add(StatCollector .translateToLocal("extracells.tooltip.amount") - + ": 0mB / 10000mB"); + + ": 0L / 64000L"); } else { list.add(StatCollector.translateToLocal("extracells.tooltip.fluid") + ": " + tank.getFluid().getLocalizedName()); list.add(StatCollector .translateToLocal("extracells.tooltip.amount") + ": " - + tank.getFluidAmount() + "mB / 10000mB"); + + tank.getFluidAmount() + "L / 64000L"); } return list; } @@ -866,7 +866,7 @@ private void tick() { if (this.tanks[i].getFluid() != null && FluidRegistry.getFluid(this.fluidFilter[i]) != this.tanks[i] .getFluid().getFluid()) { - FluidStack s = this.tanks[i].drain(125, false); + FluidStack s = this.tanks[i].drain(12500, false); if (s != null) { IAEFluidStack notAdded = storage.getFluidInventory() .injectItems( @@ -910,7 +910,7 @@ private void tick() { new FluidStack( FluidRegistry .getFluid(this.fluidFilter[i]), - 125)), + 12500)), Actionable.SIMULATE, new MachineSource(this)); if (extracted == null) continue;